Changeset 36 for trunk

Timestamp:

02/04/13 18:01:56 (12 years ago)

Author:

wcaarls

Message:

Updated saliency_detection to revision 1213

Location:

trunk/saliency_detection

Files:

• CMakeLists.txt (modified) (2 diffs)
• manifest.xml (modified) (1 diff)
• src/cvgabor.cpp (modified) (2 diffs)

trunk/saliency_detection/CMakeLists.txt

@@ -22 +22 @@
 #rosbuild_gensrv()
 
+find_package(OpenCV REQUIRED)
+
 #common commands for building c++ executables and libraries
 #rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
@@ -33 +35 @@
 
 rosbuild_add_executable(saliencyDetectionHou src/saliencyDetectionHou.cpp)
+target_link_libraries(saliencyDetectionHou ${OpenCV_LIBS})
 rosbuild_add_executable(saliencyDetectionRudinac src/saliencyDetectionRudinac.cpp)
+target_link_libraries(saliencyDetectionRudinac ${OpenCV_LIBS})
 rosbuild_add_executable(saliencyDetectionItti src/saliencyDetectionItti.cpp)
-
-target_link_libraries(saliencyDetectionItti cvgabor)
+target_link_libraries(saliencyDetectionItti cvgabor ${OpenCV_LIBS})
 
 rosbuild_make_distribution(0.1.0)

trunk/saliency_detection/manifest.xml

@@ -10 +10 @@
   <review status="unreviewed" notes=""/>
   <url>http://ros.org/wiki/saliency_detection</url>
+  <rosdep name="opencv2"/>
   <depend package="roscpp"/>
   <depend package="sensor_msgs"/>

trunk/saliency_detection/src/cvgabor.cpp

@@ -311 +311 @@
     CvMat* kernel = cvCreateMat(Width, Width, CV_32FC1);
     double ve;
-    CvScalar S;
     switch(Type)
     {
@@ -503 +502 @@
         break;
     }
+    return NULL;
 }