diff options
| author |  bsalomon <bsalomon@google.com> | 2014-12-12 15:11:17 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-12 15:11:18 -0800 |
| commit | 9880607151ca7c2dc6b1a4b9756938bd71913ab5 (patch) | |
| tree | 2f1cd6ca7cb985a7d9e21e9dd250bf8115f278e8 /src/opts | |
| parent | b927c3cbff0688954fa66a39a6dd5ef85f0b5d48 (diff) | |
Even more win64 warning fixes
Review URL: https://codereview.chromium.org/800993002
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkTextureCompression_opts_neon.cpp | 4 | ||||
| -rw-r--r-- | src/opts/SkTextureCompression_opts_neon.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opts/SkTextureCompression_opts_neon.cpp b/src/opts/SkTextureCompression_opts_neon.cpp index bd7469b84c..b3b5037b8c 100644 --- a/src/opts/SkTextureCompression_opts_neon.cpp +++ b/src/opts/SkTextureCompression_opts_neon.cpp @@ -147,7 +147,7 @@ static inline uint64x2_t fix_endianness(uint64x2_t x) { } #endif -static void compress_r11eac_blocks(uint64_t* dst, const uint8_t* src, int rowBytes) { +static void compress_r11eac_blocks(uint64_t* dst, const uint8_t* src, size_t rowBytes) { // Try to avoid switching between vector and non-vector ops... const uint8_t *const src1 = src; @@ -208,7 +208,7 @@ static void compress_r11eac_blocks(uint64_t* dst, const uint8_t* src, int rowByt } bool CompressA8toR11EAC_NEON(uint8_t* dst, const uint8_t* src, - int width, int height, int rowBytes) { + int width, int height, size_t rowBytes) { // Since we're going to operate on 4 blocks at a time, the src width // must be a multiple of 16. However, the height only needs to be a diff --git a/src/opts/SkTextureCompression_opts_neon.h b/src/opts/SkTextureCompression_opts_neon.h index dd5e75df57..ba66590ca3 100644 --- a/src/opts/SkTextureCompression_opts_neon.h +++ b/src/opts/SkTextureCompression_opts_neon.h @@ -9,6 +9,6 @@ #define SkTextureCompression_opts_neon_h_ bool CompressA8toR11EAC_NEON(uint8_t* dst, const uint8_t* src, - int width, int height, int rowBytes); + int width, int height, size_t rowBytes); #endif // SkTextureCompression_opts_neon_h_ |