[Jderobot-admin] jderobot-r1201 - in trunk/src/stable: components/openni1Server components/openniServer libs/visionlib/colorspaces

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-03-18 17:38:06 +0100 (Tue, 18 Mar 2014)
New Revision: 1201

Modified:
   trunk/src/stable/components/openni1Server/openni1Server.cfg
   trunk/src/stable/components/openniServer/openniServer.cfg
   trunk/src/stable/libs/visionlib/colorspaces/imagecv.cpp
   trunk/src/stable/libs/visionlib/colorspaces/imagecv.h
Log:
#196 depth format changed to DEPTH8_16



Modified: trunk/src/stable/components/openni1Server/openni1Server.cfg
===================================================================
--- trunk/src/stable/components/openni1Server/openni1Server.cfg	2014-03-18 16:22:33 UTC (rev 1200)
+++ trunk/src/stable/components/openni1Server/openni1Server.cfg	2014-03-18 16:38:06 UTC (rev 1201)
@@ -16,7 +16,7 @@
 
 openni1Server.calibration=./config/camRGB
 openni1Server.CameraDEPTH.Name=cameraB
-openni1Server.CameraDEPTH.Format=DEPTH8
+openni1Server.CameraDEPTH.Format=DEPTH8_16
 openni1Server.CameraDEPTH.fps=10
 
 

Modified: trunk/src/stable/components/openniServer/openniServer.cfg
===================================================================
--- trunk/src/stable/components/openniServer/openniServer.cfg	2014-03-18 16:22:33 UTC (rev 1200)
+++ trunk/src/stable/components/openniServer/openniServer.cfg	2014-03-18 16:38:06 UTC (rev 1201)
@@ -28,7 +28,7 @@
 
 #openniServer.calibration=camera-0.cfg
 openniServer.CameraDEPTH.Name=cameraB
-openniServer.CameraDEPTH.Format=DEPTH8
+openniServer.CameraDEPTH.Format=DEPTH8_16
 openniServer.CameraDEPTH.fps=10
 openniServer.CameraDEPTH.PlayerDetection=0
 openniServer.CameraDEPTH.Mirror=0

Modified: trunk/src/stable/libs/visionlib/colorspaces/imagecv.cpp
===================================================================
--- trunk/src/stable/libs/visionlib/colorspaces/imagecv.cpp	2014-03-18 16:22:33 UTC (rev 1200)
+++ trunk/src/stable/libs/visionlib/colorspaces/imagecv.cpp	2014-03-18 16:38:06 UTC (rev 1201)
@@ -54,7 +54,7 @@
   //static definitions
   const Image::FormatPtr Image::FORMAT_NONE = Image::Format::createFormat("NONE",0,0,0);
   const Image::FormatPtr ImageRGB8::FORMAT_RGB8 = Image::Format::createFormat("RGB8",CV_8UC3,&ImageRGB8::createInstance,&ImageRGB8::imageCvt);
-  const Image::FormatPtr ImageRGB8::FORMAT_DEPTH8 = Image::Format::createFormat("DEPTH8",CV_8UC3,&ImageRGB8::createInstance,&ImageRGB8::imageCvt);
+  const Image::FormatPtr ImageRGB8::FORMAT_DEPTH8_16 = Image::Format::createFormat("DEPTH8_16",CV_8UC3,&ImageRGB8::createInstance,&ImageRGB8::imageCvt);
   const Image::FormatPtr ImageYUY2::FORMAT_YUY2 = Image::Format::createFormat("YUY2",CV_8UC2,&ImageYUY2::createInstance,&ImageYUY2::imageCvt);
   const Image::FormatPtr ImageGRAY8::FORMAT_GRAY8 = Image::Format::createFormat("GRAY8",CV_8UC1,&ImageGRAY8::createInstance,&ImageGRAY8::imageCvt);
   const Image::FormatPtr ImageHSV8::FORMAT_HSV8 = Image::Format::createFormat("HSV8",CV_8UC3,&ImageHSV8::createInstance,&ImageHSV8::imageCvt);
@@ -102,8 +102,8 @@
   }
 
   Image& ImageRGB8::imageCvt(const Image& src, Image& dst) throw(NoConversion){
-    assert((src.format() == FORMAT_RGB8 || src.format() == FORMAT_DEPTH8 ) && "src is not a RGB8 image");
-    if (dst.format() == FORMAT_RGB8 || src.format() == FORMAT_DEPTH8)
+    assert((src.format() == FORMAT_RGB8 || src.format() == FORMAT_DEPTH8_16 ) && "src is not a RGB8 image");
+    if (dst.format() == FORMAT_RGB8 || src.format() == FORMAT_DEPTH8_16)
       dst = src;
     else {
       const ImageRGB8 srcRgb8(src);//cast src to rgb image

Modified: trunk/src/stable/libs/visionlib/colorspaces/imagecv.h
===================================================================
--- trunk/src/stable/libs/visionlib/colorspaces/imagecv.h	2014-03-18 16:22:33 UTC (rev 1200)
+++ trunk/src/stable/libs/visionlib/colorspaces/imagecv.h	2014-03-18 16:38:06 UTC (rev 1201)
@@ -182,7 +182,7 @@
      */
     static Image* createInstance(const int width, const int height, void *const data);
     static Image& imageCvt(const Image& src, Image& dst) throw(NoConversion);
-    static const FormatPtr FORMAT_RGB8, FORMAT_DEPTH8;
+    static const FormatPtr FORMAT_RGB8, FORMAT_DEPTH8_16;
   };
 
   /**