diff options
| -rw-r--r-- | include/utils/SkRandom.h | 2 | ||||
| -rw-r--r-- | src/core/SkBitmap.cpp | 2 | ||||
| -rw-r--r-- | tests/BitmapTest.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/utils/SkRandom.h b/include/utils/SkRandom.h index 9191ec35c1..dc9e681c5a 100644 --- a/include/utils/SkRandom.h +++ b/include/utils/SkRandom.h @@ -294,7 +294,7 @@ public: int64_t hi = this->nextS(); return (hi << 32) | this->nextU(); } - + #ifdef SK_SUPPORT_LEGACY_SK64 SK_ATTR_DEPRECATED("use next64()") void next64(Sk64* a) { diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 502d7db9b4..ee741c3df0 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -235,7 +235,7 @@ size_t SkBitmap::ComputeSafeSize(Config config, size_t rowBytes) { int64_t safeSize = ComputeSafeSize64(config, width, height, rowBytes); int32_t safeSize32 = (int32_t)safeSize; - + if (safeSize32 != safeSize) { safeSize32 = 0; } diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp index aaa297e674..ef637f4738 100644 --- a/tests/BitmapTest.cpp +++ b/tests/BitmapTest.cpp @@ -16,7 +16,7 @@ static void test_bigwidth(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, bm.setConfig(SkBitmap::kA8_Config, width, 1)); REPORTER_ASSERT(reporter, bm.setConfig(SkBitmap::kRGB_565_Config, width, 1)); - + // for a 4-byte config, this width will compute a rowbytes of 0x80000000, // which does not fit in a int32_t. setConfig should detect this, and fail. @@ -43,6 +43,6 @@ DEF_TEST(Bitmap, reporter) { REPORTER_ASSERT(reporter, SkToBool(width & height) != bm.empty()); } } - + test_bigwidth(reporter); } |