Merge branch 'master' of /home/froehlich/libs/nice/segmentation

GenericRegionSegmentationMethodSelection.h

@@ -12,6 +12,7 @@
 #include <segmentation/RSMeanShift.h>
 #include <segmentation/RSSlic.h>
 #include <segmentation/RSGraphBased.h>
+#include <segmentation/RSCache.h>
 
 namespace OBJREC
 {
@@ -24,7 +25,7 @@ class GenericRegionSegmentationMethodSelection
     */
     
     static RegionSegmentationMethod*
-    selectRegionSegmentationMethod(const Config* conf, const std::string& methode)
+    selectRegionSegmentationMethod(const NICE::Config* conf, const std::string& methode)
     {
       RegionSegmentationMethod* segmentationAlgo = NULL;
 
@@ -47,7 +48,7 @@ class GenericRegionSegmentationMethodSelection
 
       if ( segmentationAlgo == NULL )
       {
-        fthrow(Exception, "Region Segmentation Method not found: " << methode );
+        fthrow(NICE::Exception, "Region Segmentation Method not found: " << methode );
         return segmentationAlgo;
       }