[Robotflow-cvs] RobotFlow/OpenCV/src CvCaptureFrame.cc,1.2,1.3 CvHaarDetect.cc,1.2,1.3

[Nicolas P. <npa...@us...>]

Update of /cvsroot/robotflow/RobotFlow/OpenCV/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27623/OpenCV/src

Modified Files:
	CvCaptureFrame.cc CvHaarDetect.cc 
Log Message:
Cleaned code and removed releaseImage that makes FlowDesigner crash.


Index: CvHaarDetect.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/CvHaarDetect.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvHaarDetect.cc	24 Nov 2005 21:15:07 -0000	1.2
--- CvHaarDetect.cc	25 Nov 2005 00:03:23 -0000	1.3
***************
*** 160,164 ****
  	virtual ~CvHaarDetect()
  	{
! 		cerr<<"CvHaarDetect destruction"<<endl;
  		cvReleaseImage(&m_curImage);
  		
--- 160,164 ----
  	virtual ~CvHaarDetect()
  	{
! 		//cerr<<"CvHaarDetect destruction"<<endl;
  		cvReleaseImage(&m_curImage);
  		
***************
*** 266,279 ****
  
  				retval = true;
- 	                	/*if( saveDetected )
- 		                {
- 		                    strcpy( detfilename, detname );
- 		                    strcat( detfilename, filename );
- 		                    strcpy( filename, detfilename );
- 		                    cvvSaveImage( fullname, m_curImage );
- 		                }*/
- 								
- 		                //FIXME: Mem leek possible !!!
- 				//if( det ) { cvFree( (void**)&det ); det = NULL; }
  		        }
  		        
--- 266,269 ----
***************
*** 289,293 ****
  private:
  	int m_imageInID;
- 	int m_maskInID;
  	int m_activatedInID;
  	int m_roiOutID;
--- 279,282 ----
***************
*** 306,315 ****
  	int m_imgYCen;
  	
- 	int m_maxNumSkinRegions;
- 	int m_minROIWidth;
- 	int m_minROIHeight;
- 
  	CvMemStorage *m_storage1;
- 	CvMemStorage *m_storage2;
  	CvHaarClassifierCascade *m_haarClassifier1;
  	
--- 295,299 ----
***************
*** 320,329 ****
  	CvMemStorage *m_contourStorage;
  	
! 	RCPtr<Image> m_outputImage;
!         //RCPtr<VisualROI> m_objectROI;
!          RCPtr<Vector<ObjectRef> > m_ROIVect;  
!   
! 	bool isFrontFace;
! 	bool isProfileFace;
  };
  
--- 304,308 ----
  	CvMemStorage *m_contourStorage;
  	
!         RCPtr<Vector<ObjectRef> > m_ROIVect;  
  };
  

Index: CvCaptureFrame.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/CvCaptureFrame.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvCaptureFrame.cc	24 Nov 2005 21:15:07 -0000	1.2
--- CvCaptureFrame.cc	25 Nov 2005 00:03:23 -0000	1.3
***************
*** 119,125 ****
  					throw new GeneralException("PIXELSIZE not yet supported",__FILE__,__LINE__);
  				}
! 				
! 				cvReleaseImage(&m_frame);
! 				m_frame = NULL;
  			}
  		}
--- 119,126 ----
  					throw new GeneralException("PIXELSIZE not yet supported",__FILE__,__LINE__);
  				}
! 			
! 				//FIXME: It crached when tring to release m_frame ?
! 				//cvReleaseImage(&m_frame);
! 				//m_frame = NULL;
  			}
  		}