shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I3950c883,I2b679b04

* changes:
  partial_idct_test: use <limits> for int16_min/max
  vpx_timer.h,x86.h: define NOMINMAX for windows.h

--- a/test/partial_idct_test.cc

+++ b/test/partial_idct_test.cc

@@ -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 @@

 #else

   (void)a;

 #endif

-  return INT16_MAX;

+  return std::numeric_limits<int16_t>::max();

 }

 int16_t MinSupportedCoeff(InvTxfmFunc a) {

@@ -57,11 +59,11 @@

   }

 #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> {

--- a/vpx_ports/vpx_timer.h

+++ b/vpx_ports/vpx_timer.h

@@ -21,6 +21,8 @@

 /*

  * Win32 specific includes

  */

+#undef NOMINMAX

+#define NOMINMAX

 #ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

 #endif

--- a/vpx_ports/x86.h

+++ b/vpx_ports/x86.h

@@ -140,6 +140,9 @@

 #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