cudasift

features/localfeatures/LocalFeatureRGBSift.cpp

@@ -1,4 +1,11 @@
-#include "objrec/features/localfeatures/LocalFeatureRGBSift.h"
+#ifdef NICE_USELIB_OPENMP
+#include <omp.h>
+#endif
+
+#include <iostream>
+
+#include "vislearning/features/localfeatures/sift.h"
+#include "vislearning/features/localfeatures/LocalFeatureRGBSift.h"
 
 using namespace OBJREC;
 using namespace std;

features/localfeatures/LocalFeatureRGBSift.h

@@ -8,15 +8,12 @@
 #ifndef LocalFeatureRGBSiftINCLUDE
 #define LocalFeatureRGBSiftINCLUDE
 
-#include "vislearning/baselib/Config.h"
-#include "vislearning/features/localfeatures/LocalFeatureSift.h"
-#include "vislearning/features/localfeatures/sift.h"
-
-#ifdef NICE_USELIB_OPENMP
-#include <omp.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
 
-#include <iostream>
+#include "core/basics/Config.h"
+#include "vislearning/features/localfeatures/LocalFeatureSift.h"
 
 namespace OBJREC {
 
@@ -34,7 +31,7 @@ class LocalFeatureRGBSift : public LocalFeatureSift
     public:
   
 	/** simple constructor */
-	LocalFeatureRGBSift ( const Config *conf );
+	LocalFeatureRGBSift ( const NICE::Config *conf );
       
 	/** simple destructor */
 
@@ -54,8 +51,8 @@ class LocalFeatureRGBSift : public LocalFeatureSift
 	 * @return 0
 	 */
 	virtual int getDescriptors ( const NICE::ColorImage & cimg, 
-			     VVector & positions,
-			     VVector & descriptors ) const;     
+			     NICE::VVector & positions,
+			     NICE::VVector & descriptors ) const;     
 };
 
 

features/localfeatures/LocalFeatureSift.cpp

@@ -4,7 +4,10 @@
 * @author Erik Rodner
 * @date 03/10/2012
 */
-#include "objrec/features/localfeatures/LocalFeatureSift.h"
+#include <iostream>
+
+#include "vislearning/features/localfeatures/sift.h"
+#include "vislearning/features/localfeatures/LocalFeatureSift.h"
 
 
 using namespace OBJREC;
@@ -227,7 +230,7 @@ void LocalFeatureSift::withPP( const NICE::Image & img, VVector & positions, VVe
 }
 
 #ifdef NICE_USELIB_CUDASIFT
-void LocalFeatureSift::withGPU(const NICE::Image& img, OBJREC::VVector& positions, OBJREC::VVector& descriptors) const
+void LocalFeatureSift::withGPU(const NICE::Image& img, VVector& positions, VVector& descriptors) const
 {
     // fill the parameter for
     char* argv[] = {

features/localfeatures/LocalFeatureSift.h

@@ -16,10 +16,14 @@
 #define LOCALFEATURESIFTINCLUDE
 
 // NICE includes
-#include <objrec/baselib/StringTools.h>
-#include <objrec/baselib/Config.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
+
+#include "core/basics/Config.h"
+#include "core/basics/StringTools.h"
 #include "LocalFeature.h"
-#include "sift.h"
 
 // std includes
 #include <iostream>
@@ -28,8 +32,8 @@
 
 // SiftGPU & GL
 #ifdef NICE_USELIB_CUDASIFT
-		#include <src/SiftGPU.h>
-		#include <GL/gl.h>
+	#include <src/SiftGPU.h>
+	#include <GL/gl.h>
 #endif
 
 
@@ -39,7 +43,7 @@ namespace OBJREC {
 class LocalFeatureSift : public LocalFeature
 {
 private:
-    const Config* conf;
+    const NICE::Config* conf;
 
 protected:
     int octaves;
@@ -56,15 +60,15 @@ protected:
     float threshold;
     float edgeThreshold;
 
-    void withPP( const NICE::Image & img, VVector & positions, VVector & descriptors ) const;
+    void withPP( const NICE::Image & img, NICE::VVector & positions, NICE::VVector & descriptors ) const;
 #ifdef NICE_USELIB_CUDASIFT
-    void withGPU( const NICE::Image & img, VVector & positions, VVector & descriptors ) const;
+    void withGPU( const NICE::Image & img, NICE::VVector & positions, NICE::VVector & descriptors ) const;
 #endif
 
 public:
 
     /** simple constructor */
-    LocalFeatureSift ( const Config *conf );
+    LocalFeatureSift ( const NICE::Config *conf );
 
     /** simple destructor */
 
@@ -96,8 +100,8 @@ public:
      * @return 0
      */
     virtual int getDescriptors ( const NICE::Image & img,
-                                 VVector & positions,
-                                 VVector & descriptors ) const;
+                                 NICE::VVector & positions,
+                                 NICE::VVector & descriptors ) const;
 
     /**
      * computes the descriptor for a single image
@@ -105,15 +109,15 @@ public:
      * @param positions
      * @param descriptors
      */
-    void computeDesc( const NICE::Image & img, VVector & positions, VVector & descriptors ) const;
+    void computeDesc( const NICE::Image & img, NICE::VVector & positions, NICE::VVector & descriptors ) const;
 
     /**
      * sort positions by scales for faster computing of the Keypoint orientation
      * @param positions
      */
-    void sortPositions(VVector & positions) const;
+    void sortPositions(NICE::VVector & positions) const;
 
-    void visualizeFeatures ( NICE::Image & mark, const VVector & positions, size_t color ) const;
+    void visualizeFeatures ( NICE::Image & mark, const NICE::VVector & positions, size_t color ) const;