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

fixed build issue with round()

Browse Source 
not defined in msvc

Change-Id: I8fe8462a0c2f636d8b43c0243832ca67578f3665
This commit is contained in:
Yaowu Xu 2012-12-13 14:51:27 -08:00
parent 7fa3deb1f5
commit c681887652
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/dct32x32_test.cc
View File

@ -27,6 +27,14 @@ extern "C" {
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
namespace { namespace {
#ifdef _MSC_VER
static int round(double x) {
if (x < 0)
return (int)ceil(x - 0.5);
else
return (int)floor(x + 0.5);
}
#endif
#if !CONFIG_DWT32X32HYBRID #if !CONFIG_DWT32X32HYBRID
static const double kPi = 3.141592653589793238462643383279502884; static const double kPi = 3.141592653589793238462643383279502884;

14
vp9/common/vp9_systemdependent.h
View File

@ -10,6 +10,10 @@
#ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ #ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
#ifdef _MSC_VER
#include <math.h>
#endif
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#if ARCH_X86 || ARCH_X86_64 #if ARCH_X86 || ARCH_X86_64
void vpx_reset_mmx_state(void); void vpx_reset_mmx_state(void);
@ -18,6 +22,16 @@ void vpx_reset_mmx_state(void);
#define vp9_clear_system_state() #define vp9_clear_system_state()
#endif #endif
#ifdef _MSC_VER
// round is not defined in MSVC
static int round(double x) {
if (x < 0)
return (int)ceil(x - 0.5);
else
return (int)floor(x + 0.5);
}
#endif
struct VP9Common; struct VP9Common;
void vp9_machine_specific_config(struct VP9Common *); void vp9_machine_specific_config(struct VP9Common *);
#endif #endif