compilation under mac

This commit is contained in:
Alexey Spizhevoy
2011-05-18 13:02:27 +00:00
parent 8a47b3d5d5
commit 7d350280c0
3 changed files with 19 additions and 8 deletions

View File

@@ -11,7 +11,7 @@
#include <float.h>
#if defined(__GNUC__)
#if defined(__GNUC__) && !defined(__APPLE__)
#include <fpu_control.h>
#endif
@@ -48,6 +48,9 @@ bool TestHaarCascadeApplication::init()
bool TestHaarCascadeApplication::process()
{
#if defined(__APPLE)
return true;
#endif
NCVStatus ncvStat;
bool rcode = false;
@@ -200,6 +203,8 @@ bool TestHaarCascadeApplication::process()
}
ncvAssertReturn(cudaSuccess == cudaStreamSynchronize(0), false);
#if !defined(__APPLE__)
#if defined(__GNUC__)
//http://www.christian-seiler.de/projekte/fpmath/
@@ -229,6 +234,8 @@ bool TestHaarCascadeApplication::process()
searchRoiU, 1, 1.0f);
ncvAssertReturn(ncvStat == NCV_SUCCESS, false);
_controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
#endif
#endif
NCV_SKIP_COND_END