Fixed file naming inconsistencies.

PointCloudLibrary · Aug 28, 2013 · 2a8c00c · 2a8c00c
1 parent f86af39
commit 2a8c00c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
@@ -47,8 +47,8 @@ if(build)
 			include/pcl/io/openni2_camera/openni_image.h
             include/pcl/io/openni2_camera/openni_image_yuv_422.h
             include/pcl/io/openni2_camera/openni_image_rgb24.h
-            include/pcl/io/openni2_camera/openni_ir_image.h
-			include/pcl/io/openni2_camera/openni_depth_image.h
+            include/pcl/io/openni2_camera/openni_image_ir.h
+			include/pcl/io/openni2_camera/openni_image_depth.h
 
 			# Not sure if these are needed or not
 			#include/pcl/io/openni2_camera/openni_shift_to_depth_conversion.h
@@ -68,8 +68,8 @@ if(build)
 
 			# Legacy sources
 			src/openni2_camera/openni_exception.cpp
-            src/openni2_camera/openni_depth_image.cpp
-            src/openni2_camera/openni_ir_image.cpp
+            src/openni2_camera/openni_image_depth.cpp
+            src/openni2_camera/openni_image_ir.cpp
 			src/openni2_camera/openni_image_yuv_422.cpp
             src/openni2_camera/openni_image_rgb24.cpp
 			#src/openni2_camera/openni_image_bayer_grbg.cpp

diff --git a/io/include/pcl/io/openni2_camera/openni2_device.h b/io/include/pcl/io/openni2_camera/openni2_device.h
@@ -44,8 +44,8 @@
 
 // Frame conversion classes from openni 1.x wrapper
 #include <pcl/io/openni2_camera/openni_image.h>
-#include <pcl/io/openni2_camera/openni_depth_image.h>
-#include <pcl/io/openni2_camera/openni_ir_image.h>
+#include <pcl/io/openni2_camera/openni_image_depth.h>
+#include <pcl/io/openni2_camera/openni_image_ir.h>
 #include <pcl/io/openni2_camera/openni_image_yuv_422.h>
 #include <pcl/io/openni2_camera/openni_image_rgb24.h>
 

diff --git a/...cl/io/openni2_camera/openni_depth_image.h → ...cl/io/openni2_camera/openni_image_depth.h b/...cl/io/openni2_camera/openni_depth_image.h → ...cl/io/openni2_camera/openni_image_depth.h
diff --git a/...e/pcl/io/openni2_camera/openni_ir_image.h → ...e/pcl/io/openni2_camera/openni_image_ir.h b/...e/pcl/io/openni2_camera/openni_ir_image.h → ...e/pcl/io/openni2_camera/openni_image_ir.h
diff --git a/io/include/pcl/io/openni2_grabber.h b/io/include/pcl/io/openni2_grabber.h
@@ -48,8 +48,8 @@
 #include <pcl/io/openni2_camera/openni2_device_manager.h>
 #include <pcl/io/openni2_camera/openni2_device.h>
 #include <pcl/io/openni2_camera/openni_image.h>
-#include <pcl/io/openni2_camera/openni_depth_image.h>
-#include <pcl/io/openni2_camera/openni_ir_image.h>
+#include <pcl/io/openni2_camera/openni_image_depth.h>
+#include <pcl/io/openni2_camera/openni_image_ir.h>
 #include <string>
 #include <deque>
 #include <pcl/common/synchronizer.h>

diff --git a/io/src/openni2_camera/openni_depth_image.cpp → io/src/openni2_camera/openni_image_depth.cpp b/io/src/openni2_camera/openni_depth_image.cpp → io/src/openni2_camera/openni_image_depth.cpp
@@ -38,7 +38,7 @@
 #include <pcl/pcl_config.h>
 #ifdef HAVE_OPENNI2
 
-#include <pcl/io/openni2_camera/openni_depth_image.h>
+#include <pcl/io/openni2_camera/openni_image_depth.h>
 #include <sstream>
 #include <limits>
 #include <iostream>

diff --git a/io/src/openni2_camera/openni_ir_image.cpp → io/src/openni2_camera/openni_image_ir.cpp b/io/src/openni2_camera/openni_ir_image.cpp → io/src/openni2_camera/openni_image_ir.cpp
@@ -38,7 +38,7 @@
 #include <pcl/pcl_config.h>
 #ifdef HAVE_OPENNI2
 
-#include <pcl/io/openni2_camera/openni_ir_image.h>
+#include <pcl/io/openni2_camera/openni_image_ir.h>
 #include <sstream>
 #include <limits>
 #include <iostream>