likely fixed compile errors in cvhaar.cpp when built with WITH_IPP (ticket #241)

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

diff --git a/opencv/src/cv/cvhaar.cpp b/opencv/src/cv/cvhaar.cpp
index 24346ad48b57c1cbf74fb983b4900a2361edbfa4..b8d9d45b09b465f434c34b241368929ae701744a 100644 (file)
--- a/opencv/src/cv/cvhaar.cpp
+++ b/opencv/src/cv/cvhaar.cpp
@@ -848,7 +848,7 @@ struct HaarDetectObjects_ScaleImage_Invoker
         {
             ippiRectStdDev_32f_C1R(sum1.ptr<float>(y1), sum1.step,
                                    sqsum1.ptr<double>(y1), sqsum1.step,
-                                   norm1.ptr<float>(y1), norm1.step,
+                                   (float*)norm1.ptr<float>(y1), norm1.step,
                                    ippiSize(ssz.width, ssz.height), equRect );
             
             int positive = (ssz.width/ystep)*((ssz.height + ystep-1)/ystep);
@@ -871,7 +871,7 @@ struct HaarDetectObjects_ScaleImage_Invoker
                 if( ippiApplyHaarClassifier_32f_C1R(
                             sum1.ptr<float>(y1), sum1.step,
                             norm1.ptr<float>(y1), norm1.step,
-                            mask1.ptr<uchar>(y1), mask1.step,
+                            (uchar*)mask1.ptr<uchar>(y1), mask1.step,
                             ippiSize(ssz.width, ssz.height), &positive,
                             cascade->hid_cascade->stage_classifier[j].threshold,
                             (IppiHaarClassifier_32f*)cascade->hid_cascade->ipp_stages[j]) < 0 )