Renames image_util package to swri_image_util. Refs swri-robotics#231.

evenator · Sep 25, 2015 · a7b31ed · a7b31ed
1 parent d8759fd
commit a7b31ed
Show file tree

Hide file tree

Showing 30 changed files with 128 additions and 128 deletions.
diff --git a/image_util/launch/geometry_util.test b/image_util/launch/geometry_util.test
diff --git a/image_util/nodelet_plugins.xml b/image_util/nodelet_plugins.xml
diff --git a/image_util/CMakeLists.txt → swri_image_util/CMakeLists.txt b/image_util/CMakeLists.txt → swri_image_util/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(image_util)
+project(swri_image_util)
 
 find_package(catkin REQUIRED COMPONENTS 
   roscpp

diff --git a/image_util/include/image_util/draw_util.h → ..._util/include/swri_image_util/draw_util.h b/image_util/include/image_util/draw_util.h → ..._util/include/swri_image_util/draw_util.h
@@ -34,7 +34,7 @@
 
 #include <opencv2/core/core.hpp>
 
-namespace image_util
+namespace swri_image_util
 {
   void RandomColor(int32_t seed, double& r, double& g, double& b);
 

diff --git a/...e_util/include/image_util/geometry_util.h → ...l/include/swri_image_util/geometry_util.h b/...e_util/include/image_util/geometry_util.h → ...l/include/swri_image_util/geometry_util.h
@@ -26,7 +26,7 @@
 
 #include <tf/transform_datatypes.h>
 
-namespace image_util
+namespace swri_image_util
 {
   typedef cv::Rect_<double> BoundingBox;
 

diff --git a/..._util/include/image_util/image_matching.h → .../include/swri_image_util/image_matching.h b/..._util/include/image_util/image_matching.h → .../include/swri_image_util/image_matching.h
@@ -35,7 +35,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/features2d/features2d.hpp>
 
-namespace image_util
+namespace swri_image_util
 {
   /**
    * @brief      Computes the fundamental matrix for a set of matching points in

diff --git a/.../include/image_util/image_normalization.h → ...ude/swri_image_util/image_normalization.h b/.../include/image_util/image_normalization.h → ...ude/swri_image_util/image_normalization.h
@@ -39,7 +39,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-namespace image_util
+namespace swri_image_util
 {
   /**
    * Normalizes the illumination in an image using a normalization image as a 

diff --git a/...util/include/image_util/image_warp_util.h → ...include/swri_image_util/image_warp_util.h b/...util/include/image_util/image_warp_util.h → ...include/swri_image_util/image_warp_util.h
@@ -47,9 +47,9 @@
 #include <opencv2/stitching/detail/warpers.hpp>
 
 // RANGER Libraries
-#include <image_util/image_matching.h>
+#include <swri_image_util/image_matching.h>
 
-namespace image_util
+namespace swri_image_util
 {
   cv::Mat WarpImage(const cv::Mat& image, double roll, double pitch);
 

diff --git a/...nclude/image_util/rolling_normalization.h → ...e/swri_image_util/rolling_normalization.h b/...nclude/image_util/rolling_normalization.h → ...e/swri_image_util/rolling_normalization.h
@@ -39,7 +39,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-namespace image_util
+namespace swri_image_util
 {
   class RollingNormalization
   {

diff --git a/swri_image_util/launch/geometry_util.test b/swri_image_util/launch/geometry_util.test
@@ -0,0 +1,3 @@
+<launch>
+  <test test-name="test_geometry_util" pkg="swri_image_util" type="test_geometry_util" />
+</launch>
diff --git a/image_util/mainpage.dox → swri_image_util/mainpage.dox b/image_util/mainpage.dox → swri_image_util/mainpage.dox
diff --git a/swri_image_util/nodelet_plugins.xml b/swri_image_util/nodelet_plugins.xml
@@ -0,0 +1,27 @@
+<library path="lib/libswri_image_util_nodelets">
+
+  <class name="swri_image_util/rotate_image" type="swri_image_util::RotateImageNodelet" base_class_type="nodelet::Nodelet">
+    <description>
+      Nodelet to rotate an image a multiple of 90 degrees.
+    </description>
+  </class>
+
+  <class name="swri_image_util/scale_image" type="swri_image_util::ScaleImageNodelet" base_class_type="nodelet::Nodelet">
+    <description>
+      Nodelet to scale an image.
+    </description>
+  </class>
+
+  <class name="swri_image_util/contrast_stretch" type="swri_image_util::ContrastStretchNodelet" base_class_type="nodelet::Nodelet">
+    <description>
+      Nodelet to contrast stretch an image.
+    </description>
+  </class>
+
+  <class name="swri_image_util/draw_text" type="swri_image_util::DrawTextNodelet" base_class_type="nodelet::Nodelet">
+    <description>
+      Nodelet to draw text on an image.
+    </description>
+  </class>
+
+</library>
diff --git a/image_util/package.xml → swri_image_util/package.xml b/image_util/package.xml → swri_image_util/package.xml
@@ -1,9 +1,9 @@
 <package format="2">
-  <name>image_util</name>
+  <name>swri_image_util</name>
   <version>0.0.1</version>
   <description>
 
-     image_util
+     swri_image_util
 
   </description>
   <author>Kris Kozak</author>

diff --git a/image_util/src/draw_util.cpp → swri_image_util/src/draw_util.cpp b/image_util/src/draw_util.cpp → swri_image_util/src/draw_util.cpp
@@ -27,7 +27,7 @@
 //
 // *****************************************************************************
 
-#include <image_util/draw_util.h>
+#include <swri_image_util/draw_util.h>
 
 #include <cstdlib>
 #include <algorithm>
@@ -42,7 +42,7 @@
 
 #include <opencv_util/show.h>
 
-namespace image_util
+namespace swri_image_util
 {
   void RandomColor(int32_t seed, double& r, double& g, double& b)
   {

diff --git a/image_util/src/geometry_util.cpp → swri_image_util/src/geometry_util.cpp b/image_util/src/geometry_util.cpp → swri_image_util/src/geometry_util.cpp
@@ -27,7 +27,7 @@
 //
 // *****************************************************************************
 
-#include <image_util/geometry_util.h>
+#include <swri_image_util/geometry_util.h>
 
 #include <cmath>
 #include <limits>
@@ -43,7 +43,7 @@
 
 #include <math_util/constants.h>
 
-namespace image_util
+namespace swri_image_util
 {
   bool Intersects(const BoundingBox& box1, const BoundingBox& box2)
   {

diff --git a/image_util/src/image_matching.cpp → swri_image_util/src/image_matching.cpp b/image_util/src/image_matching.cpp → swri_image_util/src/image_matching.cpp
@@ -27,7 +27,7 @@
 //
 // *****************************************************************************
 
-#include <image_util/image_matching.h>
+#include <swri_image_util/image_matching.h>
 
 #include <algorithm>
 #include <vector>
@@ -41,7 +41,7 @@
 
 #include <ros/ros.h>
 
-namespace image_util
+namespace swri_image_util
 {
   void GetFundamentalInliers(const cv::Mat points1,
                              const cv::Mat points2,

diff --git a/image_util/src/image_normalization.cpp → swri_image_util/src/image_normalization.cpp b/image_util/src/image_normalization.cpp → swri_image_util/src/image_normalization.cpp
@@ -33,9 +33,9 @@
  *      Author: kkozak
  */
 
-#include <image_util/image_normalization.h>
+#include <swri_image_util/image_normalization.h>
 
-namespace image_util
+namespace swri_image_util
 {
   void normalize_illumination(cv::Mat NormImage,
                               cv::Mat SourceImage,

diff --git a/image_util/src/image_warp_util.cpp → swri_image_util/src/image_warp_util.cpp b/image_util/src/image_warp_util.cpp → swri_image_util/src/image_warp_util.cpp
@@ -27,12 +27,12 @@
 //
 // *****************************************************************************
 
-#include <image_util/image_warp_util.h>
+#include <swri_image_util/image_warp_util.h>
 #include <opencv_util/model_fit.h>
 
 #include <algorithm>
 
-namespace image_util
+namespace swri_image_util
 {
   cv::Mat WarpImage(const cv::Mat& image, double roll, double pitch)
   {
@@ -243,14 +243,14 @@ namespace image_util
           double cur_roll = min_roll + dr * roll_idx;
 
           cv::Mat kp1_warped;
-          image_util::WarpPoints(cur_pitch,
+          swri_image_util::WarpPoints(cur_pitch,
                      cur_roll,
                      image_size,
                      points1,
                      kp1_warped);
 
           cv::Mat kp2_warped;
-          image_util::WarpPoints(cur_pitch,
+          swri_image_util::WarpPoints(cur_pitch,
                      cur_roll,
                      image_size,
                      points2,
@@ -401,7 +401,7 @@ namespace image_util
       return;
     }
 
-    image_util::WarpPoints(pitch,
+    swri_image_util::WarpPoints(pitch,
                roll,
                cv::Size(im1_.cols, im1_.rows),
                pts_in,
@@ -488,7 +488,7 @@ namespace image_util
       GetMeanPitchAndRoll(pitch, roll);
     }
 
-    image_util::WarpPoints(pitch, roll, image_size, points_in, points_out);
+    swri_image_util::WarpPoints(pitch, roll, image_size, points_in, points_out);
   }
 
   //////////////////////////////////////////////////////////////////////////////

diff --git a/...src/nodelets/contrast_stretch_nodelet.cpp → ...src/nodelets/contrast_stretch_nodelet.cpp b/...src/nodelets/contrast_stretch_nodelet.cpp → ...src/nodelets/contrast_stretch_nodelet.cpp
@@ -38,11 +38,11 @@
 #include <sensor_msgs/image_encodings.h>
 #include <sensor_msgs/Image.h>
 #include <cv_bridge/cv_bridge.h>
-#include <image_util/image_normalization.h>
+#include <swri_image_util/image_normalization.h>
 
 #include <math_util/math_util.h>
 
-namespace image_util
+namespace swri_image_util
 {
   class ContrastStretchNodelet : public nodelet::Nodelet
   {
@@ -79,7 +79,7 @@ namespace image_util
     {
       cv_bridge::CvImagePtr cv_image = cv_bridge::toCvCopy(image);
 
-      image_util::ContrastStretch(bins_, cv_image->image, cv_image->image, mask_);
+      swri_image_util::ContrastStretch(bins_, cv_image->image, cv_image->image, mask_);
 
       image_pub_.publish(cv_image->toImageMsg());
     }
@@ -98,7 +98,7 @@ namespace image_util
 // Register nodelet plugin
 #include <pluginlib/class_list_macros.h>
 PLUGINLIB_DECLARE_CLASS(
-    image_util,
+    swri_image_util,
     contrast_stretch,
-    image_util::ContrastStretchNodelet,
+    swri_image_util::ContrastStretchNodelet,
     nodelet::Nodelet)
diff --git a/...e_util/src/nodelets/draw_text_nodelet.cpp → ...e_util/src/nodelets/draw_text_nodelet.cpp b/...e_util/src/nodelets/draw_text_nodelet.cpp → ...e_util/src/nodelets/draw_text_nodelet.cpp
@@ -40,7 +40,7 @@
 #include <cv_bridge/cv_bridge.h>
 #include <math_util/math_util.h>
 
-namespace image_util
+namespace swri_image_util
 {
   class DrawTextNodelet : public nodelet::Nodelet
   {
@@ -105,7 +105,7 @@ namespace image_util
 // Register nodelet plugin
 #include <pluginlib/class_list_macros.h>
 PLUGINLIB_DECLARE_CLASS(
-    image_util,
+    swri_image_util,
     draw_text,
-    image_util::DrawTextNodelet,
+    swri_image_util::DrawTextNodelet,
     nodelet::Nodelet)
diff --git a/...til/src/nodelets/rotate_image_nodelet.cpp → ...til/src/nodelets/rotate_image_nodelet.cpp b/...til/src/nodelets/rotate_image_nodelet.cpp → ...til/src/nodelets/rotate_image_nodelet.cpp
@@ -40,7 +40,7 @@
 
 #include <math_util/math_util.h>
 
-namespace image_util
+namespace swri_image_util
 {
   class RotateImageNodelet : public nodelet::Nodelet
   {
@@ -105,7 +105,7 @@ namespace image_util
 // Register nodelet plugin
 #include <pluginlib/class_list_macros.h>
 PLUGINLIB_DECLARE_CLASS(
-    image_util,
+    swri_image_util,
     rotate_image,
-    image_util::RotateImageNodelet,
+    swri_image_util::RotateImageNodelet,
     nodelet::Nodelet)
diff --git a/...util/src/nodelets/scale_image_nodelet.cpp → ...util/src/nodelets/scale_image_nodelet.cpp b/...util/src/nodelets/scale_image_nodelet.cpp → ...util/src/nodelets/scale_image_nodelet.cpp
@@ -40,7 +40,7 @@
 #include <cv_bridge/cv_bridge.h>
 #include <math_util/math_util.h>
 
-namespace image_util
+namespace swri_image_util
 {
   class ScaleImageNodelet : public nodelet::Nodelet
   {
@@ -101,7 +101,7 @@ namespace image_util
 // Register nodelet plugin
 #include <pluginlib/class_list_macros.h>
 PLUGINLIB_DECLARE_CLASS(
-    image_util,
+    swri_image_util,
     scale_image,
-    image_util::ScaleImageNodelet,
+    swri_image_util::ScaleImageNodelet,
     nodelet::Nodelet)
diff --git a/image_util/src/nodes/contrast_stretch.cpp → ...image_util/src/nodes/contrast_stretch.cpp b/image_util/src/nodes/contrast_stretch.cpp → ...image_util/src/nodes/contrast_stretch.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 
   nodelet::M_string remappings;
   nodelet::V_string my_argv;
-  manager.load(ros::this_node::getName(), "image_util/contrast_stretch",
+  manager.load(ros::this_node::getName(), "swri_image_util/contrast_stretch",
       remappings, my_argv);
 
   ros::spin();

diff --git a/image_util/src/nodes/draw_text.cpp → swri_image_util/src/nodes/draw_text.cpp b/image_util/src/nodes/draw_text.cpp → swri_image_util/src/nodes/draw_text.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 
   nodelet::M_string remappings;
   nodelet::V_string my_argv;
-  manager.load(ros::this_node::getName(), "image_util/draw_text",
+  manager.load(ros::this_node::getName(), "swri_image_util/draw_text",
       remappings, my_argv);
 
   ros::spin();

diff --git a/..._util/src/nodes/dummy_image_publisher.cpp → ..._util/src/nodes/dummy_image_publisher.cpp b/..._util/src/nodes/dummy_image_publisher.cpp → ..._util/src/nodes/dummy_image_publisher.cpp
diff --git a/...es/normalization_image_generator_node.cpp → ...es/normalization_image_generator_node.cpp b/...es/normalization_image_generator_node.cpp → ...es/normalization_image_generator_node.cpp
@@ -41,7 +41,7 @@
 #include <opencv2/highgui/highgui.hpp>
 
 // RANGER Libraries
-#include <image_util/image_normalization.h>
+#include <swri_image_util/image_normalization.h>
 
 class NormalizationImageNode
 {
@@ -122,7 +122,7 @@ class NormalizationImageNode
 
   void generate_and_write_image()
   {
-    cv::Mat norm_im = image_util::generate_normalization_image(image_array_);
+    cv::Mat norm_im = swri_image_util::generate_normalization_image(image_array_);
     if (!norm_im.empty())
     {
       try

diff --git a/image_util/src/nodes/rotate_image.cpp → swri_image_util/src/nodes/rotate_image.cpp b/image_util/src/nodes/rotate_image.cpp → swri_image_util/src/nodes/rotate_image.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 
   nodelet::M_string remappings;
   nodelet::V_string my_argv;
-  manager.load(ros::this_node::getName(), "image_util/rotate_image",
+  manager.load(ros::this_node::getName(), "swri_image_util/rotate_image",
       remappings, my_argv);
 
   ros::spin();