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/utils/SkTextureCompressor.cpp | |
parent | b927c3cbff0688954fa66a39a6dd5ef85f0b5d48 (diff) |
Even more win64 warning fixes
Review URL: https://codereview.chromium.org/800993002
Diffstat (limited to 'src/utils/SkTextureCompressor.cpp')
-rw-r--r-- | src/utils/SkTextureCompressor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/SkTextureCompressor.cpp b/src/utils/SkTextureCompressor.cpp index 799eadc84b..12621e118f 100644 --- a/src/utils/SkTextureCompressor.cpp +++ b/src/utils/SkTextureCompressor.cpp @@ -23,9 +23,9 @@ // Convert ETC1 functions to our function signatures static bool compress_etc1_565(uint8_t* dst, const uint8_t* src, - int width, int height, int rowBytes) { + int width, int height, size_t rowBytes) { #ifndef SK_IGNORE_ETC1_SUPPORT - return 0 == etc1_encode_image(src, width, height, 2, rowBytes, dst); + return 0 == etc1_encode_image(src, width, height, 2, SkToInt(rowBytes), dst); #else return false; #endif @@ -120,7 +120,7 @@ int GetCompressedDataSize(Format fmt, int width, int height) { } bool CompressBufferToFormat(uint8_t* dst, const uint8_t* src, SkColorType srcColorType, - int width, int height, int rowBytes, Format format, bool opt) { + int width, int height, size_t rowBytes, Format format, bool opt) { CompressionProc proc = NULL; if (opt) { proc = SkTextureCompressorGetPlatformProc(srcColorType, format); |