[Robotflow-cvs] RobotFlow/Vision/include VisualHistogramDesc.h,1.4,1.5

[Pierre M. <sid...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Vision/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20981

Modified Files:
	VisualHistogramDesc.h 
Log Message:
Fixed some std namespace errors

Index: VisualHistogramDesc.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/VisualHistogramDesc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VisualHistogramDesc.h	26 May 2005 19:37:29 -0000	1.4
--- VisualHistogramDesc.h	1 Jun 2005 03:34:48 -0000	1.5
***************
*** 191,220 ****
  	{
  		int b, d;
! 		out << "<VisualHistogramDesc " << endl;
! 		out << "<NumDimensions " << m_numDimensions << " >" << endl;
! 		out << "<TotalBins " << m_totalBins << " >" << endl;
! 		out << "<SimilarityType " << (int)m_simType << " >" << endl;
! 		out << "<NormFlag " << (int)m_normFlag << " >" << endl;
! 		out << "<LastMaxVal " << m_lastMaxVal << " >" << endl;
  
! 		out << "<NumBins " << endl;
  		for (d=0; d<m_numDimensions; d++)  {
  			out << m_numBins[d] << " ";
  		}
! 		out << " >" << endl;
  		
! 		out << "<BinsWidth " << endl;
  		for (d=0; d<m_numDimensions; d++)  {
  			out << m_binsWidth[d] << " ";
  		}
! 		out << " >" << endl;
  	
! 		out << "<Bins " << endl;
  		for (b=0; b<m_totalBins; ++b)  {
  			out << m_bins[b] << " ";
  		}
! 		out << " >" << endl;
  	
! 		out << " >" << endl;
  	}
  
--- 191,220 ----
  	{
  		int b, d;
! 		out << "<VisualHistogramDesc " << std::endl;
! 		out << "<NumDimensions " << m_numDimensions << " >" << std::endl;
! 		out << "<TotalBins " << m_totalBins << " >" << std::endl;
! 		out << "<SimilarityType " << (int)m_simType << " >" << std::endl;
! 		out << "<NormFlag " << (int)m_normFlag << " >" << std::endl;
! 		out << "<LastMaxVal " << m_lastMaxVal << " >" << std::endl;
  
! 		out << "<NumBins " << std::endl;
  		for (d=0; d<m_numDimensions; d++)  {
  			out << m_numBins[d] << " ";
  		}
! 		out << " >" << std::endl;
  		
! 		out << "<BinsWidth " << std::endl;
  		for (d=0; d<m_numDimensions; d++)  {
  			out << m_binsWidth[d] << " ";
  		}
! 		out << " >" << std::endl;
  	
! 		out << "<Bins " << std::endl;
  		for (b=0; b<m_totalBins; ++b)  {
  			out << m_bins[b] << " ";
  		}
! 		out << " >" << std::endl;
  	
! 		out << " >" << std::endl;
  	}
  
***************
*** 889,893 ****
  	inline double EpanechKernel(double i_dist) const
  	{
! 		return max( 0.0, k_VISUALHIST_2DIVPI * (1.0 - i_dist) );
  	}
  	
--- 889,893 ----
  	inline double EpanechKernel(double i_dist) const
  	{
! 		return std::max( 0.0, k_VISUALHIST_2DIVPI * (1.0 - i_dist) );
  	}