[openrtm-commit:01381] r136 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion: include/DilationErosion src

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-03-19 15:05:01 +0900 (Wed, 19 Mar 2014)
New Revision: 136

Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h
   branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp
Log:
Dilationerosion : Resolved warning message. refs #2704

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h	2014-03-18 08:16:32 UTC (rev 135)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/include/DilationErosion/DilationErosion.h	2014-03-19 06:05:01 UTC (rev 136)
@@ -10,7 +10,7 @@
 #ifndef DILATIONEROSION_H
 #define DILATIONEROSION_H
 
-#define THRESHOLD_MAX_VALUE	255   /* 2値化の際に使用する最大値 */
+#define THRESHOLD_MAX_VALUE	255
 
 #include <rtm/Manager.h>
 #include <rtm/DataFlowComponentBase.h>

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp	2014-03-18 08:16:32 UTC (rev 135)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Dilationerosion/src/DilationErosion.cpp	2014-03-19 06:05:01 UTC (rev 136)
@@ -220,7 +220,7 @@
     cvErode(m_binary_buff, m_erosion_image, NULL, m_count_erosion);
 
     /* 画像データのサイズ取得 */
-    double len = (m_output_image_buff->nChannels * m_output_image_buff->width * m_output_image_buff->height);
+    int len = (m_output_image_buff->nChannels * m_output_image_buff->width * m_output_image_buff->height);
     m_img_out.pixels.length(len);
     m_img_dilation.pixels.length(len);
     m_img_erosion.pixels.length(len);