fixed #1257 ( HaarCascadeApplication GPU test crash )
This commit is contained in:
@@ -223,18 +223,22 @@ bool TestHaarCascadeApplication::process()
|
|||||||
|
|
||||||
_FPU_SETCW(fpu_oldcw); // restore old cw
|
_FPU_SETCW(fpu_oldcw); // restore old cw
|
||||||
#else
|
#else
|
||||||
|
#ifndef _WIN64
|
||||||
Ncv32u fpu_oldcw, fpu_cw;
|
Ncv32u fpu_oldcw, fpu_cw;
|
||||||
_controlfp_s(&fpu_cw, 0, 0);
|
_controlfp_s(&fpu_cw, 0, 0);
|
||||||
fpu_oldcw = fpu_cw;
|
fpu_oldcw = fpu_cw;
|
||||||
_controlfp_s(&fpu_cw, _PC_24, _MCW_PC);
|
_controlfp_s(&fpu_cw, _PC_24, _MCW_PC);
|
||||||
|
#endif
|
||||||
ncvStat = ncvApplyHaarClassifierCascade_host(
|
ncvStat = ncvApplyHaarClassifierCascade_host(
|
||||||
h_integralImage, h_rectStdDev, h_pixelMask,
|
h_integralImage, h_rectStdDev, h_pixelMask,
|
||||||
detectionsOnThisScale_h,
|
detectionsOnThisScale_h,
|
||||||
haar, h_HaarStages, h_HaarNodes, h_HaarFeatures, false,
|
haar, h_HaarStages, h_HaarNodes, h_HaarFeatures, false,
|
||||||
searchRoiU, 1, 1.0f);
|
searchRoiU, 1, 1.0f);
|
||||||
ncvAssertReturn(ncvStat == NCV_SUCCESS, false);
|
ncvAssertReturn(ncvStat == NCV_SUCCESS, false);
|
||||||
|
#ifndef _WIN64
|
||||||
_controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
|
_controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
NCV_SKIP_COND_END
|
NCV_SKIP_COND_END
|
||||||
|
Reference in New Issue
Block a user