From e1fd68b21e514bd96658421329be78a226549e46 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sat, 31 Mar 2012 23:49:35 +0000 Subject: [PATCH] fixed #1257 ( HaarCascadeApplication GPU test crash ) --- modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp index bdbd0b2..1879b62 100644 --- a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp +++ b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp @@ -223,18 +223,22 @@ bool TestHaarCascadeApplication::process() _FPU_SETCW(fpu_oldcw); // restore old cw #else +#ifndef _WIN64 Ncv32u fpu_oldcw, fpu_cw; _controlfp_s(&fpu_cw, 0, 0); fpu_oldcw = fpu_cw; _controlfp_s(&fpu_cw, _PC_24, _MCW_PC); +#endif ncvStat = ncvApplyHaarClassifierCascade_host( h_integralImage, h_rectStdDev, h_pixelMask, detectionsOnThisScale_h, haar, h_HaarStages, h_HaarNodes, h_HaarFeatures, false, searchRoiU, 1, 1.0f); ncvAssertReturn(ncvStat == NCV_SUCCESS, false); +#ifndef _WIN64 _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); #endif +#endif #endif NCV_SKIP_COND_END -- 2.7.4