generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix of HaarCascade GPU test for aarch64.

Browse Source
This commit is contained in:
Alexander Smorkalov 2014-12-19 19:05:53 +03:00
parent a5969aec96
commit c0a8d4e1ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
View File

@ -44,7 +44,7 @@
#include <float.h> #include <float.h>
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__)
#include <fpu_control.h> #include <fpu_control.h>
#endif #endif
@ -58,7 +58,7 @@ namespace
~FpuControl(); ~FpuControl();
private: private:
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined (__aarch64__)
fpu_control_t fpu_oldcw, fpu_cw; fpu_control_t fpu_oldcw, fpu_cw;
#elif defined(_WIN32) && !defined(_WIN64) #elif defined(_WIN32) && !defined(_WIN64)
unsigned int fpu_oldcw, fpu_cw; unsigned int fpu_oldcw, fpu_cw;
@ -67,7 +67,7 @@ namespace
FpuControl::FpuControl() FpuControl::FpuControl()
{ {
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__)
_FPU_GETCW(fpu_oldcw); _FPU_GETCW(fpu_oldcw);
fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_DOUBLE & ~_FPU_SINGLE) | _FPU_SINGLE; fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_DOUBLE & ~_FPU_SINGLE) | _FPU_SINGLE;
_FPU_SETCW(fpu_cw); _FPU_SETCW(fpu_cw);
@ -80,7 +80,7 @@ namespace
FpuControl::~FpuControl() FpuControl::~FpuControl()
{ {
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__)
_FPU_SETCW(fpu_oldcw); _FPU_SETCW(fpu_oldcw);
#elif defined(_WIN32) && !defined(_WIN64) #elif defined(_WIN32) && !defined(_WIN64)
_controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);