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

Merge pull request #6982 from tfauck:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-07-25 11:39:10 +00:00
commit 52444bf8d0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/cudalegacy/test/TestHaarCascadeApplication.cpp
View File

@ -52,7 +52,8 @@ namespace
~FpuControl(); ~FpuControl();
private: private:
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) &&
!defined(__aarch64__) && !defined(__powerpc64__)
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;
@ -61,7 +62,8 @@ namespace
FpuControl::FpuControl() FpuControl::FpuControl()
{ {
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) &&
!defined(__aarch64__) && !defined(__powerpc64__)
_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);
@ -74,7 +76,8 @@ namespace
FpuControl::~FpuControl() FpuControl::~FpuControl()
{ {
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) &&
!defined(__aarch64__) && !defined(__powerpc64__)
_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);

3
modules/cudalegacy/test/test_precomp.hpp
View File

@ -51,7 +51,8 @@
#ifndef __OPENCV_TEST_PRECOMP_HPP__ #ifndef __OPENCV_TEST_PRECOMP_HPP__
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) &&
!defined(__aarch64__) && !defined(__powerpc64__)
#include <fpu_control.h> #include <fpu_control.h>
#endif #endif