From 2edea9454d2b2a191b3b94590757de7e6244403c Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 27 Oct 2014 16:27:48 +0000 Subject: [PATCH] Fix lint extraneous warning on row_win assembly by disabling the warning for those affected lines. BUG=none TESTED=line row_win.cc R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/29969004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1144 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_win.cc | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index b76ffe344..cc5b60fa6 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1142 +Version: 1143 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index c1bfcea4c..3852d2aec 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1142 +#define LIBYUV_VERSION 1143 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_win.cc b/source/row_win.cc index a9adf3052..e5ad416b8 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -1531,8 +1531,8 @@ static const lvec16 kUVBiasR_AVX = { // Read 8 UV from 422, upsample to 16 UV. #define READYUV422_AVX2 __asm { \ - __asm vmovq xmm0, qword ptr [esi] /* U */ \ - __asm vmovq xmm1, qword ptr [esi + edi] /* V */ \ + __asm vmovq xmm0, qword ptr [esi] /* U */ /* NOLINT */ \ + __asm vmovq xmm1, qword ptr [esi + edi] /* V */ /* NOLINT */ \ __asm lea esi, [esi + 8] \ __asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \ __asm vpermq ymm0, ymm0, 0xd8 \ @@ -5132,8 +5132,7 @@ void InterpolateRow_AVX2(uint8* dst_ptr, const uint8* src_ptr, align 4 xloop50: vmovdqu ymm0, [esi] - vmovdqu ymm1, [esi + edx] - vpavgb ymm0, ymm0, ymm1 + vpavgb ymm0, ymm0, [esi + edx] sub ecx, 32 vmovdqu [esi + edi], ymm0 lea esi, [esi + 32]