diff options
| author | fbarchard@google.com <fbarchard@google.com> | 2014-10-13 23:26:17 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com> | 2014-10-13 23:26:17 +0000 |
| commit | f6e495169c1a341abbd8e642473b1c332f09a0e4 (patch) | |
| tree | aabac3319097792163ed2e004505a428403385bc | |
| parent | f58c85199e7703202d3099f274418218831edf75 (diff) | |
| download | libyuv-f6e495169c1a341abbd8e642473b1c332f09a0e4.tar.gz | |
Copy width to 64 bit register to work around clang 3.4 warning
BUG=none
TESTED=local ios 64 bit build completes without size warnings on xcode 5.1.1
R=harryjin@google.com
Review URL: https://webrtc-codereview.appspot.com/31699004
git-svn-id: http://libyuv.googlecode.com/svn/trunk@1120 16f28f9a-4ce2-e073-06de-1de4eb20be90
| -rw-r--r-- | README.chromium | 2 | ||||
| -rw-r--r-- | include/libyuv/version.h | 2 | ||||
| -rw-r--r-- | source/rotate_neon64.cc | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/README.chromium b/README.chromium index 8c0662a..72d95a5 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1119 +Version: 1120 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 90a56fd..744fb9a 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 1119 +#define LIBYUV_VERSION 1120 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/rotate_neon64.cc b/source/rotate_neon64.cc index d54378e..92358af 100644 --- a/source/rotate_neon64.cc +++ b/source/rotate_neon64.cc @@ -27,6 +27,7 @@ void TransposeWx8_NEON(const uint8* src, int src_stride, uint8* dst, int dst_stride, int width) { const uint8* src_temp = NULL; + int64 width64 = (int64) width; // Work around clang 3.4 warning. asm volatile ( // loops are on blocks of 8. loop will stop when // counter gets to or below 0. starting the counter @@ -237,10 +238,10 @@ void TransposeWx8_NEON(const uint8* src, int src_stride, : "+r"(src_temp), // %0 "+r"(src), // %1 "+r"(dst), // %2 - "+r"(width) // %3 + "+r"(width64) // %3 : "r"(&kVTbl4x4Transpose), // %4 - "r"((ptrdiff_t)src_stride), // %5 - "r"((ptrdiff_t)dst_stride) // %6 + "r"(static_cast<ptrdiff_t>(src_stride)), // %5 + "r"(static_cast<ptrdiff_t>(dst_stride)) // %6 : "memory", "cc", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23" ); @@ -255,6 +256,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride, uint8* dst_b, int dst_stride_b, int width) { const uint8* src_temp = NULL; + int64 width64 = (int64) width; // Work around clang 3.4 warning. asm volatile ( // loops are on blocks of 8. loop will stop when // counter gets to or below 0. starting the counter @@ -522,7 +524,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride, "+r"(src), // %1 "+r"(dst_a), // %2 "+r"(dst_b), // %3 - "+r"(width) // %4 + "+r"(width64) // %4 : "r"(static_cast<ptrdiff_t>(src_stride)), // %5 "r"(static_cast<ptrdiff_t>(dst_stride_a)), // %6 "r"(static_cast<ptrdiff_t>(dst_stride_b)), // %7 |