From 00c501fe4351ed09edb9fc4cb57d6dae63020a6f Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Fri, 15 Sep 2017 15:00:39 -0700 Subject: [PATCH] Cast xgetbv from int64 to int to avoid Visual C warning. TBR=kjellander@chromium.org Bug: libyuv:735 Test: try bots Change-Id: I00dc06689cd0a23847865c0c8edeb538b0cc81ac Reviewed-on: https://chromium-review.googlesource.com/669142 Reviewed-by: Frank Barchard --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 85302b61c..3de0df132 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1669 +Version: 1670 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index a522556ce..f27ccfbb0 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1669 +#define LIBYUV_VERSION 1670 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/cpu_id.cc b/source/cpu_id.cc index ce165544d..12e03345b 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -124,7 +124,7 @@ void CpuId(int eax, int ecx, int* cpu_info) { int GetXCR0() { int xcr0 = 0; #if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 160040219) - xcr0 = _xgetbv(0); // VS2010 SP1 required. + xcr0 = (int) _xgetbv(0); // VS2010 SP1 required. NOLINT #elif defined(__i386__) || defined(__x86_64__) asm(".byte 0x0f, 0x01, 0xd0" : "=a"(xcr0) : "c"(0) : "%edx"); #endif // defined(__i386__) || defined(__x86_64__)