From b744f3e628bb9e3558c11da6483360cbbe550025 Mon Sep 17 00:00:00 2001 From: vp153 Date: Wed, 31 Mar 2010 17:51:43 +0000 Subject: [PATCH] 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 --- opencv/src/cv/cvhaar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opencv/src/cv/cvhaar.cpp b/opencv/src/cv/cvhaar.cpp index 24346ad4..b8d9d45b 100644 --- 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(y1), sum1.step, sqsum1.ptr(y1), sqsum1.step, - norm1.ptr(y1), norm1.step, + (float*)norm1.ptr(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(y1), sum1.step, norm1.ptr(y1), norm1.step, - mask1.ptr(y1), mask1.step, + (uchar*)mask1.ptr(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 ) -- 2.39.2