From 8d005f9d31e86cd6c1839d72a9728f58e8aa26ed Mon Sep 17 00:00:00 2001 From: mycae Date: Jul 18 2012 22:42:01 +0000 Subject: * Update to 0.0.11 --- diff --git a/3Depict-0.0.10-fix-value-shuffle-abort.patch b/3Depict-0.0.10-fix-value-shuffle-abort.patch deleted file mode 100644 index 4c07b6e..0000000 --- a/3Depict-0.0.10-fix-value-shuffle-abort.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -r c4664e47d2a1 src/APTClasses.h -diff -r c4664e47d2a1 src/filters/transform.cpp ---- src/filters/transform.cpp Wed Apr 04 12:29:05 2012 +1000 -+++ src/filters/transform.cpp Fri Apr 06 12:54:27 2012 +0100 -@@ -891,7 +891,7 @@ - progress.filterProgress=0; - progress.stepName=TRANS("Collate"); - progress.maxStep=3; -- if((*callback)(true)) -+ if(!(*callback)(true)) - return ERR_CALLBACK_FAIL; - //we have to cross the streams (I thought that was bad?) - // - Each dataset is no longer independant, and needs to -@@ -1644,17 +1644,30 @@ - bool rotateTest(); - bool translateTest(); - bool scaleTest(); -+bool shuffleTest(); -+ -+ -+class MassCompare -+{ -+ public: -+ inline bool operator()(const IonHit &h1,const IonHit &h2) const -+ {return h1.getMassToCharge() streamIn,streamOut; -+ IonStreamData *d; -+ -+ RandNumGen rng; -+ rng.initTimer(); -+ -+ const unsigned int NUM_PTS=1000; -+ -+ unsigned int span[]={ -+ 5, 7, 9 -+ }; -+ d=synthDataPoints(span,NUM_PTS); -+ streamIn.push_back(d); -+ -+ //Set up the filter itself -+ //--- -+ TransformFilter *f=new TransformFilter; -+ -+ bool needUp; -+ //Switch to shuffle mode -+ TEST(f->setProperty(0,KEY_MODE, -+ TRANS(TRANSFORM_MODE_STRING[MODE_VALUE_SHUFFLE]),needUp),"refresh error code"); -+ //--- -+ -+ -+ //OK, so now run the shuffle -+ //Do the refresh -+ ProgressData p; -+ TEST(!f->refresh(streamIn,streamOut,p,dummyCallback),"refresh error code"); -+ delete f; -+ -+ TEST(streamOut.size() == 1,"stream count"); -+ TEST(streamOut[0]->getStreamType() == STREAM_TYPE_IONS,"stream type"); -+ TEST(streamOut[0]->getNumBasicObjects() == d->data.size(),"Ion count invariance"); -+ -+ TEST(streamOut[0]->getNumBasicObjects() == d->data.size(),"Ion count invariance"); -+ -+ IonStreamData *outData=(IonStreamData*)streamOut[0]; -+ -+ //Check to see that the output masses each exist in the input, -+ //but are not in the same sequence -+ //--- -+ -+ -+ bool sequenceDifferent=false; -+ for(size_t ui=0;uidata.size();ui++) -+ { -+ if(d->data[ui].getMassToCharge() == outData->data[ui].getMassToCharge()) -+ { -+ sequenceDifferent=true; -+ break; -+ } -+ } -+ TEST(sequenceDifferent, -+ "Should be shuffled - Prob. of sequence being identical in both orig & shuffled cases is very low"); -+ //Sort masses -+ MassCompare cmp; -+ std::sort(outData->data.begin(),outData->data.end(),cmp); -+ std::sort(d->data.begin(),d->data.end(),cmp); -+ -+ -+ for(size_t ui=0;uidata.size();ui++) -+ { -+ TEST(d->data[ui].getMassToCharge() == outData->data[ui].getMassToCharge(),"Shuffle + Sort mass should be the same"); -+ -+ } -+ -+ -+ -+ delete streamOut[0]; -+ delete d; -+ return true; -+} -+ - #endif diff --git a/3Depict-0.0.10-font-path.patch b/3Depict-0.0.10-font-path.patch deleted file mode 100644 index 70252ee..0000000 --- a/3Depict-0.0.10-font-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r dfc04b8b14b2 src/wxcomponents.cpp ---- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 -+++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 -@@ -666,6 +666,7 @@ - //This is a list of possible target dirs to search - //(Oh look Ma, I'm autoconf!) - const char *dirs[] = { ".", -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/share/fonts/truetype", - "/usr/local/share/fonts/truetype", - "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.10-manual-pdf-loc.patch b/3Depict-0.0.10-manual-pdf-loc.patch deleted file mode 100644 index a819a9c..0000000 --- a/3Depict-0.0.10-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r 634db475333f src/3Depict.cpp ---- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 -+++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 -@@ -2142,9 +2142,9 @@ - string s; - s=locateDataFile("3Depict-manual.pdf"); - -- //Also Debian makes us use the lowercase "D", so check there too. -- if(!s.size()) -- s=locateDataFile("3depict-manual.pdf"); -+ //Also Fedora has diff dir -+ if(!wxFileExists(wxStr(s))) -+ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; - - - //If we found it, use the default program associated with that data file diff --git a/3Depict-0.0.10-png-gray.patch b/3Depict-0.0.10-png-gray.patch deleted file mode 100644 index 5c0e793..0000000 --- a/3Depict-0.0.10-png-gray.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r src/pngread.c src/pngread.c ---- src/pngread.c -+++ src/pngread.c -@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { --#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) - png_set_expand_gray_1_2_4_to_8(png_ptr); --#else -- png_set_gray_1_2_4_to_8(png_ptr); --#endif - } - - /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/3Depict-0.0.11-font-path.patch b/3Depict-0.0.11-font-path.patch new file mode 100644 index 0000000..70252ee --- /dev/null +++ b/3Depict-0.0.11-font-path.patch @@ -0,0 +1,11 @@ +diff -r dfc04b8b14b2 src/wxcomponents.cpp +--- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 ++++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 +@@ -666,6 +666,7 @@ + //This is a list of possible target dirs to search + //(Oh look Ma, I'm autoconf!) + const char *dirs[] = { ".", ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/share/fonts/truetype", + "/usr/local/share/fonts/truetype", + "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.11-manual-pdf-loc.patch b/3Depict-0.0.11-manual-pdf-loc.patch new file mode 100644 index 0000000..a819a9c --- /dev/null +++ b/3Depict-0.0.11-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +diff -r 634db475333f src/3Depict.cpp +--- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 ++++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 +@@ -2142,9 +2142,9 @@ + string s; + s=locateDataFile("3Depict-manual.pdf"); + +- //Also Debian makes us use the lowercase "D", so check there too. +- if(!s.size()) +- s=locateDataFile("3depict-manual.pdf"); ++ //Also Fedora has diff dir ++ if(!wxFileExists(wxStr(s))) ++ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; + + + //If we found it, use the default program associated with that data file diff --git a/3Depict.spec b/3Depict.spec index 77729d8..a061a1c 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.10 -Release: 3%{?dist} +Version: 0.0.11 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -36,10 +36,6 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch -#libpng API change patch -Patch2: %{name}-%{version}-png-gray.patch -#post-release patch to fix transform->value shuffle uncond. abort. -Patch3: %{name}-%{version}-fix-value-shuffle-abort.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -53,8 +49,6 @@ useful for general scalar valued point data purposes. %patch0 %patch1 -%patch2 -%patch3 %build %configure --disable-debug-checks --enable-openmp-parallel @@ -122,6 +116,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 18 2012 D Haley - 0.0.11-1 +- Update to 0.0.11 + * Wed Jul 18 2012 Fedora Release Engineering - 0.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild