corrected some typos & added type cast

git-svn-id: https://code.ros.org/svn/opencv/trunk@1158 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cvaux.hpp b/opencv/include/opencv/cvaux.hpp
index 6de06054c902a6aaa63e8ba93f14538a9f954f2a..37ae8978b23b75ea49ccb603c2a510e209b25bff 100644 (file)
--- a/opencv/include/opencv/cvaux.hpp
+++ b/opencv/include/opencv/cvaux.hpp
@@ -112,7 +112,7 @@ public:
     { return m_back_project; }
 
     float query( int* bin ) const
-    { return m_hist ? cvGetRealND(m_hist->bins, bin) : 0.f; }
+    { return m_hist ? (float)cvGetRealND(m_hist->bins, bin) : 0.f; }
     
 protected:
 

diff --git a/opencv/include/opencv/cvmat.hpp b/opencv/include/opencv/cvmat.hpp
index 0c24ce9c1647b6e53f356909db0d75890bc26383..5defb594c42f8a779be5e6febf6dfea2d0c945ed 100644 (file)
--- a/opencv/include/opencv/cvmat.hpp
+++ b/opencv/include/opencv/cvmat.hpp
@@ -1814,27 +1814,27 @@ inline _CvMAT_MUL_ADD_ operator - ( const _CvMAT_T_& b, const _CvMAT_MUL_& a )
 {   return _CvMAT_MUL_ADD_( a.a, a.b, -a.alpha, &b.a, b.alpha, a.t_ab + 4 );  }
 
 
-/* mmuladd = mat_scaled_shited * mat */
+/* mmuladd = mat_scaled_shifted * mat */
 inline _CvMAT_MUL_ADD_ operator * ( const _CvMAT_SCALE_SHIFT_& a, const CvMAT& b )
 {   return _CvMAT_MUL_ADD_( a.a, &b, a.alpha, &b, a.beta, 0 );  }
 
-/* mmuladd = mat * mat_scaled_shited */
+/* mmuladd = mat * mat_scaled_shifted */
 inline _CvMAT_MUL_ADD_ operator * ( const CvMAT& b, const _CvMAT_SCALE_SHIFT_& a )
 {   return _CvMAT_MUL_ADD_( &b, a.a, a.alpha, &b, a.beta, 0 );  }
 
-/* mmuladd = mat_scaled_shited * mat_scaled */
+/* mmuladd = mat_scaled_shifted * mat_scaled */
 inline _CvMAT_MUL_ADD_ operator * ( const _CvMAT_SCALE_SHIFT_& a, const _CvMAT_SCALE_& b )
 {   return _CvMAT_MUL_ADD_( a.a, b.a, a.alpha*b.alpha, b.a, a.beta*b.alpha, 0 );  }
 
-/* mmuladd = mat_scaled * mat_scaled_shited */
+/* mmuladd = mat_scaled * mat_scaled_shifted */
 inline _CvMAT_MUL_ADD_ operator * ( const _CvMAT_SCALE_& b, const _CvMAT_SCALE_SHIFT_& a )
 {   return _CvMAT_MUL_ADD_( b.a, a.a, a.alpha*b.alpha, b.a, a.beta*b.alpha, 0 );  }
 
-/* mmuladd = mat_scaled_shited * (mat^t) */
+/* mmuladd = mat_scaled_shifted * (mat^t) */
 inline _CvMAT_MUL_ADD_ operator * ( const _CvMAT_SCALE_SHIFT_& a, const _CvMAT_T_& b )
 {   return _CvMAT_MUL_ADD_( a.a, &b.a, a.alpha*b.alpha, &b.a, a.beta*b.alpha, 6 );  }
 
-/* mmuladd = (mat^t) * mat_scaled_shited */
+/* mmuladd = (mat^t) * mat_scaled_shifted */
 inline _CvMAT_MUL_ADD_ operator * ( const _CvMAT_T_& b, const _CvMAT_SCALE_SHIFT_& a )
 {   return _CvMAT_MUL_ADD_( &b.a, a.a, a.alpha*b.alpha, &b.a, a.beta*b.alpha, 5 );  }