[openrtm-commit:00188] r42 - branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction

[openrtm ＠ openrtm.org]

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

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

Modified: branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/ImageSubstraction.cpp
===================================================================
--- branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/ImageSubstraction.cpp	2011-06-17 07:37:50 UTC (rev 41)
+++ branches/ForVC2010/ImageProcessing/opencv/components/ImageSubstraction/ImageSubstraction.cpp	2011-06-17 07:42:41 UTC (rev 42)
@@ -32,7 +32,7 @@
   };
 // </rtc-template>
 
-int count = 0;
+int ImageSubstraction_count = 0;
 int key;		//	ƒL[“ü—Í—p‚̕ϐ”
 int	mode = 0;	// 0: ‰æ‘f‚²‚ƂɈقȂé臒l / 1: ‰æ‘œ‘S‘̂ňê‚‚Ì臒l
 int g_temp_w = 0;
@@ -219,7 +219,7 @@
 
 RTC::ReturnCode_t ImageSubstraction::onActivated(RTC::UniqueId ec_id)
 {
-	count = 0;
+	ImageSubstraction_count = 0;
 	g_temp_w = 0;
 	g_temp_h = 0;
 
@@ -256,7 +256,7 @@
 {	
 	
 	//‰Šú’l‚ðŽæ“¾‚·‚éB
-	if(count == 0 && m_img_origIn.isNew()) {
+	if(ImageSubstraction_count == 0 && m_img_origIn.isNew()) {
 		
 		m_img_origIn.read();
 		
@@ -293,13 +293,13 @@
 
 			initializeBackgroundModel( NUM_OF_BACKGROUND_FRAMES, cvSize(m_img_orig.width, m_img_orig.height) );
 			
-			count = 1;
+			ImageSubstraction_count = 1;
 			g_temp_w = m_img_orig.width;
 			g_temp_h = m_img_orig.height;
 		}
 	}
 
-	if(count == 1 && m_img_origIn.isNew()) {
+	if(ImageSubstraction_count == 1 && m_img_origIn.isNew()) {
 		
 		m_img_origIn.read();
 		
@@ -415,7 +415,7 @@
 			g_temp_h = m_img_orig.height;
 		
 		}else if(g_temp_w != m_img_orig.width || g_temp_h != m_img_orig.height){
-			count = 0;
+			ImageSubstraction_count = 0;
 		}
 		
 	}