[openrtm-commit:00187] r41 - branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-06-17 16:37:50 +0900 (Fri, 17 Jun 2011)
New Revision: 41

Modified:
   branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/SubStractCaptureImage.cpp
Log:
For vc2010. refs #1915

Modified: branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/SubStractCaptureImage.cpp
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/SubStractCaptureImage.cpp	2011-06-17 07:28:53 UTC (rev 40)
+++ branches/ForVC2010/ImageProcessing/opencv/components/SubStractCaptureImage/SubStractCaptureImage.cpp	2011-06-17 07:37:50 UTC (rev 41)
@@ -44,7 +44,7 @@
 
 int g_temp_w = 0;
 int g_temp_h = 0;
-int count = 0;
+int SubStractCaptureImage_count = 0;
 
 void showFlipImage( char *windowName, IplImage *image ) {
 	if ( image->origin == 0 ) {
@@ -139,7 +139,7 @@
 {
 	g_temp_w = 0;
 	g_temp_h = 0;
-	count = 0;
+	SubStractCaptureImage_count = 0;
 	
 	inputImage = NULL;
 	backgroundAverageImage = NULL;
@@ -266,7 +266,7 @@
 RTC::ReturnCode_t SubStractCaptureImage::onExecute(RTC::UniqueId ec_id)
 {	
 	
-	if(m_image_origIn.isNew() && count == 0){
+	if(m_image_origIn.isNew() && SubStractCaptureImage_count == 0){
 	
 		m_image_origIn.read();
 
@@ -317,11 +317,11 @@
 			g_temp_w = m_image_orig.width;
 			g_temp_h = m_image_orig.height;
 
-			count = 1;
+			SubStractCaptureImage_count = 1;
 
 		}
 
-	}else if(m_image_origIn.isNew() && count != 0 ){
+	}else if(m_image_origIn.isNew() && SubStractCaptureImage_count != 0 ){
 		
 		m_image_origIn.read();
 
@@ -535,7 +535,7 @@
 		//g_temp_w = m_image_orig.width;
 		//g_temp_h = m_image_orig.height;
 
-		count = 0;
+		SubStractCaptureImage_count = 0;
 	}
 
     return RTC::RTC_OK;