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

Merge changes I3950c883,I2b679b04

Browse Source 
* changes:
  partial_idct_test: use <limits> for int16_min/max
  vpx_timer.h,x86.h: define NOMINMAX for windows.h
This commit is contained in:
James Zern 2016-11-15 23:41:18 +00:00 committed by Gerrit Code Review
commit f09c687ea9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/partial_idct_test.cc
View File

@ -12,6 +12,8 @@
#include <stdlib.h>
#include <string.h>
#include <limits>
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vp9_rtcd.h"
@ -45,7 +47,7 @@ int16_t MaxSupportedCoeff(InvTxfmFunc a) {
#else
(void)a;
#endif
return INT16_MAX;
return std::numeric_limits<int16_t>::max();
}
int16_t MinSupportedCoeff(InvTxfmFunc a) {
@ -57,11 +59,11 @@ int16_t MinSupportedCoeff(InvTxfmFunc a) {
}
#elif HAVE_NEON
if (a == vpx_idct4x4_16_add_neon) {
return INT16_MIN + 1;
return std::numeric_limits<int16_t>::min() + 1;
}
#endif
#endif // !CONFIG_EMULATE_HARDWARE
return INT16_MIN;
return std::numeric_limits<int16_t>::min();
}
class PartialIDctTest : public ::testing::TestWithParam<PartialInvTxfmParam> {

2
vpx_ports/vpx_timer.h
View File

@ -21,6 +21,8 @@
/*
* Win32 specific includes
*/
#undef NOMINMAX
#define NOMINMAX
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif

3
vpx_ports/x86.h
View File

@ -140,6 +140,9 @@ static INLINE uint64_t xgetbv(void) {
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1700
#undef NOMINMAX
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if WINAPI_FAMILY_PARTITION(WINAPI_FAMILY_APP)
#define getenv(x) NULL