Commit 037ff6a9 authored by Pierre Kraemer's avatar Pierre Kraemer

minor modifs for Mac OS compilation

parent 0edf4e04
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include <iostream> #include <iostream>
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/Qt/qtInputs.h" #include "Utils/qtInputs.h"
#include "ui_clipping.h" #include "ui_clipping.h"
// inclure qtui.h juste après le ui_xxx.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/generic/parameters.h"
#include "Topology/map/embeddedMap3.h" #include "Topology/map/embeddedMap3.h"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this library; if not, write to the Free Software Foundation, * * along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * 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 * * Contact information: cgogn@unistra.fr *
* * * *
*******************************************************************************/ *******************************************************************************/
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "ui_mcmesh.h" #include "ui_mcmesh.h"
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/map2.h"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this library; if not, write to the Free Software Foundation, * * along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* * * *
* Web site: http://cgogn.unistra.fr/ * * Web site: http://cgogn.unistra.fr/ *
* Contact information: cgogn@unistra.fr * * Contact information: cgogn@unistra.fr *
* * * *
*******************************************************************************/ *******************************************************************************/
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "ui_viewer.h" #include "ui_viewer.h"
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap2.h" #include "Topology/map/embeddedMap2.h"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "Utils/frameManipulator.h" #include "Utils/frameManipulator.h"
#include "ui_volumeExplorer.h" #include "ui_volumeExplorer.h"
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include "ui_show_traversors.h" #include "ui_show_traversors.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "ui_tuto5.h" #include "ui_tuto5.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "Algo/Parallel/parallel_foreach.h" #include "Algo/Parallel/parallel_foreach.h"
// for file input // for file input
#include "Utils/Qt/qtInputs.h" #include "Utils/qtInputs.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "ui_tuto_oper2.h" #include "ui_tuto_oper2.h"
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "ui_tuto_oper3.h" #include "ui_tuto_oper3.h"
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "ui_tuto_orbits.h" #include "ui_tuto_orbits.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/Qt/qtui.h" #include "Utils/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -326,8 +326,8 @@ void foreach_cell(typename PFP::MAP& map, unsigned int cell, FunctorMapThreaded< ...@@ -326,8 +326,8 @@ void foreach_cell(typename PFP::MAP& map, unsigned int cell, FunctorMapThreaded<
template <typename PFP> 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) 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]; std::vector<Dart>* vd = new std::vector<Dart>[nbth];
boost::thread* threads[nbth]; boost::thread** threads = new boost::thread*[nbth];
Dart d=map.begin(); Dart d=map.begin();
...@@ -370,7 +370,7 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>& ...@@ -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)); threads[i] = new boost::thread(ThreadFunction<typename PFP::MAP>(func, vd[i],sync1,sync2, finished,0));
} }
// and continue to traverse the map // 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) for (unsigned int i=0; i<nbth; ++i)
tempo[i].reserve(szbuff); tempo[i].reserve(szbuff);
...@@ -406,6 +406,10 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>& ...@@ -406,6 +406,10 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>&
threads[i]->join(); threads[i]->join();
delete threads[i]; delete threads[i];
} }
delete vd;
delete threads;
delete tempo;
} }
......
...@@ -587,7 +587,7 @@ template <typename TYPEDOUBLE> ...@@ -587,7 +587,7 @@ template <typename TYPEDOUBLE>
void Image<DIM,TYPE>::subSample2() void Image<DIM,TYPE>::subSample2()
{ {
Image<DIM,TYPE>* newImg = subSampleToNewImage2<TYPEDOUBLE>(); Image<DIM,TYPE>* newImg = subSampleToNewImage2<TYPEDOUBLE>();
swap(*newImg); this->swap(*newImg);
delete newImg; delete newImg;
} }
...@@ -720,7 +720,7 @@ template < unsigned int DIM, typename TYPE > ...@@ -720,7 +720,7 @@ template < unsigned int DIM, typename TYPE >
void Image<DIM,TYPE>::rotate90(int axis) void Image<DIM,TYPE>::rotate90(int axis)
{ {
Image<DIM,TYPE>* newImg = rotate90ToNewImage(axis); Image<DIM,TYPE>* newImg = rotate90ToNewImage(axis);
swap(*newImg); this->swap(*newImg);
delete newImg; delete newImg;
} }
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
* Contact information: cgogn@unistra.fr * * Contact information: cgogn@unistra.fr *
* * * *
*******************************************************************************/ *******************************************************************************/
#include "Utils/Qt/qtInputs.h"
#include "Utils/qtInputs.h"
#include <iostream> #include <iostream>
namespace CGoGN namespace CGoGN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment