modifié : CMakeLists.txt

modifié :         CMakeListsOTB.txt
	modifié :         LICENSE
	modifié :         MakefileNoOTB
	modifié :         Readme.html
	modifié :         Readme.txt
	modifié :         include/Appli/Option.hpp
	modifié :         include/Appli/Selected.hpp
	modifié :         include/Appli/Selected.tpp
	modifié :         include/ArrayTree/ArrayTreeBuilder.hpp
	modifié :         include/ArrayTree/ArrayTreeBuilder.tpp
	modifié :         include/ArrayTree/Border.hpp
	modifié :         include/ArrayTree/Border.tpp
	modifié :         include/ArrayTree/GraphWalker.hpp
	modifié :         include/ArrayTree/GraphWalker.tpp
	modifié :         include/ArrayTree/Leader.hpp
	modifié :         include/ArrayTree/Leader.tpp
	modifié :         include/ArrayTree/Weight.hpp
	modifié :         include/ArrayTree/Weight.tpp
	modifié :         include/ArrayTree/triskeleArrayTreeBase.hpp
	modifié :         include/ArrayTree/triskeleArrayTreeBase.tpp
	modifié :         include/ArrayTree/triskeleSort.hpp
	modifié :         include/ArrayTree/triskeleSort.tpp
	modifié :         include/AttributeProfiles.hpp
	modifié :         include/AttributeProfiles.tpp
	modifié :         include/Attributes/AreaAttributes.hpp
	modifié :         include/Attributes/AreaAttributes.tpp
	modifié :         include/Attributes/AverageAttributes.hpp
	modifié :         include/Attributes/AverageAttributes.tpp
	modifié :         include/Attributes/MoIAttributes.hpp
	modifié :         include/Attributes/MoIAttributes.tpp
	modifié :         include/Attributes/SDAttributes.hpp
	modifié :         include/Attributes/SDAttributes.tpp
	modifié :         include/Attributes/WeightAttributes.hpp
	modifié :         include/Attributes/WeightAttributes.tpp
	modifié :         include/Attributes/XYAttributes.hpp
	modifié :         include/Attributes/XYAttributes.tpp
	modifié :         include/CompAttribute.hpp
	modifié :         include/CompAttribute.tpp
	modifié :         include/IImage.hpp
	modifié :         include/IImage.tpp
	modifié :         include/QuadTree/QuadTreeBuilder.hpp
	modifié :         include/Tree.hpp
	modifié :         include/Tree.tpp
	modifié :         include/TreeBuilder.hpp
	modifié :         include/TreeBuilder.tpp
	modifié :         include/TreeStats.hpp
	modifié :         include/TreeStats.tpp
	modifié :         include/XMLTree/XMLTreeBuilder.hpp
	modifié :         include/triskeleBase.hpp
	modifié :         include/triskeleBase.tpp
	modifié :         include/triskeleDealThreads.hpp
	modifié :         include/triskeleDealThreads.tpp
	modifié :         include/triskeleDebug.hpp
	modifié :         include/triskeleGdalGetType.hpp
	modifié :         otb-module.cmake
	modifié :         src/Appli/Option.cpp
	modifié :         src/Appli/Selected.cpp
	modifié :         src/ArrayTree/triskeleArrayTreeBase.cpp
	modifié :         src/CMakeLists.txt
	modifié :         src/IImage.cpp
	modifié :         src/PerfArrayTreeBuilder.cpp
	modifié :         src/QuadTree/QuadTreeBuilder.cpp
	modifié :         src/TestArrayTreeBuilder.cpp
	modifié :         src/Tree.cpp
	modifié :         src/TreeStats.cpp
	modifié :         src/XMLTree/XMLTreeBuilder.cpp
	modifié :         src/apGenerator.cpp
	modifié :         src/triskeleBase.cpp
	modifié :         src/triskeleDebug.cpp

include/AttributeProfiles.tpp

@@ -55,6 +55,7 @@ AttributeProfiles<PixelT>::print (ostream &out) const {
   const Size doubleSize (tree.getSize().width, 2*tree.getSize ().height);
   out << "AP" << endl
       << printMap (&values[0], doubleSize, tree.getNodeCount ()) << endl << endl;
+  return out;
 }
 
 #endif // _OTB_TRISKELE_ATTRIBUTE_PROFILES_TPP

include/Attributes/AreaAttributes.hpp

@@ -17,7 +17,7 @@ namespace otb {
       template<typename PixelT>
       inline void cut (vector<vector<PixelT> > &allBands, const AttributeProfiles<PixelT> &attributeProfiles,
 		       const vector<DimImg> &thresholds) const;
-      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "area"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "area"); return out; }
     protected:
       inline void compute ();
     };

include/Attributes/AverageAttributes.hpp

@@ -16,7 +16,7 @@ namespace otb {
       template<typename PixelT>
       inline AverageAttributes (const Tree &tree, const Raster<PixelT> &raster, const AreaAttributes &areaAttributes);
       inline ~AverageAttributes ();
-      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "average"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "average"); return out; }
     protected:
       template<typename PixelT>
       inline void compute (const Raster<PixelT> &raster, const AreaAttributes &areaAttributes);

include/Attributes/MoIAttributes.hpp

@@ -13,7 +13,7 @@ namespace otb {
     public:
       inline MoIAttributes (const Tree &tree, const AreaAttributes &areaAttributes, const XYAttributes &xyAttributes);
       inline ~MoIAttributes ();
-      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "moi"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "moi"); return out; }
 
       template<typename PixelT>
       inline void cut (vector<vector<PixelT> > &allBands, const AttributeProfiles<PixelT> &attributeProfiles,

include/Attributes/SDAttributes.hpp

@@ -15,7 +15,7 @@ namespace otb {
     public:
       inline SDAttributes (const Tree &tree, const AreaAttributes &areaAttributes);
       inline ~SDAttributes ();
-      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "sd"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "sd"); return out; }
 
       template<typename PixelT>
       inline void cut (vector<vector<PixelT> > &allBands, const AttributeProfiles<PixelT> &attributeProfiles,

include/Attributes/WeightAttributes.hpp

@@ -16,7 +16,7 @@ namespace otb {
 
       inline void setWeightBounds (Tree &tree);
 
-      virtual inline ostream &print (ostream &out) const { CompAttribute<WeightT>::print (out, "weight"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute<WeightT>::print (out, "weight"); return out; }
     };
 
 #include "WeightAttributes.tpp"

include/Attributes/XYAttributes.hpp

@@ -14,7 +14,7 @@ namespace otb {
     struct AverageXY {
       double x, y;
       inline AverageXY () : x(0), y(0) {}
-      friend ostream &operator << (ostream& out, const AverageXY &xy) { return out << "(" << xy.x << ", " << xy.y << ")"; }
+      friend ostream &operator << (ostream& out, const AverageXY &xy) { return out << "(" << xy.x << ", " << xy.y << ")"; return out; }
       operator DimImg () const { return (DimImg) (x*y); }
     };
 
@@ -22,7 +22,7 @@ namespace otb {
     public:
       inline XYAttributes (const Tree &tree, const AreaAttributes &areaAttributes);
       inline ~XYAttributes ();
-      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "xy"); }
+      virtual inline ostream &print (ostream &out) const { CompAttribute::print (out, "xy"); return out; }
     protected:
       inline void compute (const AreaAttributes &areaAttributes);
     };

include/CompAttribute.hpp

@@ -22,7 +22,7 @@ namespace otb {
       inline AttrT *getValues ();
       inline AttrT getMaxValue () const;
 
-      virtual inline ostream &print (ostream &out) const { print (out, ""); }
+      virtual inline ostream &print (ostream &out) const { print (out, ""); return out; }
 
     protected:
       const Tree &tree;

include/CompAttribute.tpp

@@ -52,7 +52,7 @@ inline ostream &
 CompAttribute<AttrT>::print (ostream &out, const string &msg) const {
   cout << "values: " << msg << endl;
   const Size doubleSize (tree.getSize().width, 2*tree.getSize ().height);
-  cout << printMap (&values[0], doubleSize, tree.getCompCount ()) << endl << endl;
+  return cout << printMap (&values[0], doubleSize, tree.getCompCount ()) << endl << endl;
 }
 
 template<typename AttrT>

include/triskeleDealThreads.tpp

@@ -60,7 +60,6 @@ dealThread (const DimImg &maxId, unsigned int coreCount, const FunctThreadMinMax
   }
     
   std::vector<DimImg> maxIds = getDealThreadBounds (maxId, coreCount);
-  boost::thread tasks [coreCount];
 #ifdef THREAD_DISABLE
   for (unsigned int idCopyValInThread = 0; idCopyValInThread < coreCount; ++idCopyValInThread) {
     functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]);
@@ -72,10 +71,11 @@ dealThread (const DimImg &maxId, unsigned int coreCount, const FunctThreadMinMax
       functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]);
     });
 #else /* BOOST thread */
+  boost::thread tasks [coreCount];
   for (unsigned int idCopyValInThread = 0; idCopyValInThread < coreCount; ++idCopyValInThread) {
-    tasks[idCopyValInThread] = boost::thread ([/*no ref!!!*/idCopyValInThread, &maxIds, &functThreadMinMax] () {
-	functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]);
-      });
+    tasks.push_back (boost::thread ([/*no ref!!!*/idCopyValInThread, &maxIds, &functThreadMinMax] () {
+	  functThreadMinMax (idCopyValInThread, maxIds[idCopyValInThread], maxIds[idCopyValInThread+1]);
+	}));
   }
   for (unsigned int i = 0; i < coreCount; ++i)
     tasks[i].join ();

src/Appli/Option.cpp

@@ -202,18 +202,18 @@ Option::parse (int argc, char** argv) {
   selectedBand.toSet ();
 
   Size orgSize = inputImage.getSize ();
-  if (width < 0 || width > orgSize.width)
-    width = left <= 0 ? orgSize.width : min (1L, orgSize.width-left);
-  if (height < 0 || height > orgSize.height)
-    height = top <= 0 ? orgSize.height : min (1L, orgSize.height-top);
+  if (width < 0 || width > (long) orgSize.width)
+    width = left <= 0 ? (long) orgSize.width : min (1L, (long) orgSize.width-left);
+  if (height < 0 || height > (long) orgSize.height)
+    height = top <= 0 ? (long) orgSize.height : min (1L, (long) orgSize.height-top);
   if (left < 0)
-    left = (orgSize.width - width)/2;
+    left = ((long) orgSize.width - width)/2;
   if (top < 0)
-    top = (orgSize.height - height)/2;
-  if (left > orgSize.width - width)
-    left = orgSize.width - width;
-  if (top > orgSize.height - height)
-    top = orgSize.height - height;
+    top = ((long) orgSize.height - height)/2;
+  if (left > (long) orgSize.width - width)
+    left = (long) orgSize.width - width;
+  if (top > (long) orgSize.height - height)
+    top = (long) orgSize.height - height;
   topLeft = Point ((DimSideImg) left, (DimSideImg) top);
   size = Size ((DimSideImg) width, (DimSideImg) height);