minor modifs for Mac OS compilation

Apps/Examples/clipping.h

@@ -28,11 +28,11 @@
 #include <iostream>
 
 #include "Utils/Qt/qtSimple.h"
-#include "Utils/Qt/qtInputs.h"
+#include "Utils/qtInputs.h"
 
 #include "ui_clipping.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/embeddedMap3.h"

Apps/Examples/mcmesh.h

@@ -17,7 +17,7 @@
 * along with this library; if not, write to the Free Software Foundation,      *
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
 *                                                                              *
-* Web site: https://iggservis.u-strasbg.fr/CGoGN/                              *
+* Web site: http://cgogn.unistra.fr                                            *
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
@@ -26,7 +26,7 @@
 
 #include "Utils/Qt/qtSimple.h"
 #include "ui_mcmesh.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/map2.h"

Apps/Examples/viewer.h

@@ -26,7 +26,7 @@
 
 #include "Utils/Qt/qtSimple.h"
 #include "ui_viewer.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/embeddedMap2.h"

Apps/Examples/volumeExplorer.h

@@ -46,7 +46,7 @@
 #include "Utils/frameManipulator.h"
 
 #include "ui_volumeExplorer.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;

Apps/Tuto/show_traversors.h

@@ -56,7 +56,7 @@
 
 #include "ui_show_traversors.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;

Apps/Tuto/tuto5.h

@@ -57,7 +57,7 @@
 
 #include "ui_tuto5.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;

Apps/Tuto/tuto_mt.cpp

@@ -42,7 +42,7 @@
 #include "Algo/Parallel/parallel_foreach.h"
 
 // for file input
- #include "Utils/Qt/qtInputs.h"
+#include "Utils/qtInputs.h"
 
 using namespace CGoGN ;
 

Apps/Tuto/tuto_oper2.h

@@ -40,7 +40,7 @@
 
 
 #include "ui_tuto_oper2.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 #include "Utils/Qt/qtSimple.h"
 #include "Utils/cgognStream.h"
 

Apps/Tuto/tuto_oper3.h

@@ -40,7 +40,7 @@
 
 
 #include "ui_tuto_oper3.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 #include "Utils/Qt/qtSimple.h"
 #include "Utils/cgognStream.h"
 

Apps/Tuto/tuto_orbits.h

@@ -57,7 +57,7 @@
 
 #include "ui_tuto_orbits.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;

include/Algo/Parallel/parallel_foreach.hpp

@@ -326,8 +326,8 @@ void foreach_cell(typename PFP::MAP& map, unsigned int cell, FunctorMapThreaded<
 template <typename PFP>
 void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>& func,  unsigned int nbth, unsigned int szbuff, bool needMarkers, const FunctorSelect& good)
 {
-	std::vector<Dart> vd[nbth];
-	boost::thread* threads[nbth];
+	std::vector<Dart>* vd = new std::vector<Dart>[nbth];
+	boost::thread** threads = new boost::thread*[nbth];
 
 	Dart d=map.begin();
 
@@ -370,7 +370,7 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>&
 			threads[i] = new boost::thread(ThreadFunction<typename PFP::MAP>(func, vd[i],sync1,sync2, finished,0));
 	}
 	// and continue to traverse the map
-	std::vector<Dart> tempo[nbth];
+	std::vector<Dart>* tempo = new std::vector<Dart>[nbth];
 	for (unsigned int i=0; i<nbth; ++i)
 		tempo[i].reserve(szbuff);
 
@@ -406,6 +406,10 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>&
 		threads[i]->join();
 		delete threads[i];
 	}
+	
+	delete vd;
+	delete threads;
+	delete tempo;
 }
 
 

include/Utils/textures.hpp

@@ -587,7 +587,7 @@ template <typename TYPEDOUBLE>
 void Image<DIM,TYPE>::subSample2()
 {
 	Image<DIM,TYPE>* newImg = subSampleToNewImage2<TYPEDOUBLE>();
-	swap(*newImg);
+	this->swap(*newImg);
 	delete newImg;
 }
 
@@ -720,7 +720,7 @@ template < unsigned int DIM, typename TYPE >
 void Image<DIM,TYPE>::rotate90(int axis)
 {
 	Image<DIM,TYPE>* newImg = rotate90ToNewImage(axis);
-	swap(*newImg);
+	this->swap(*newImg);
 	delete newImg;
 }
 

src/Utils/Qt/qtinputs.cpp → src/Utils/qtinputs.cpp

@@ -21,7 +21,8 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
-#include "Utils/Qt/qtInputs.h"
+
+#include "Utils/qtInputs.h"
 #include <iostream>
 
 namespace CGoGN