aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBitmap.cpp74
-rw-r--r--src/core/SkMallocPixelRef.cpp7
-rw-r--r--src/core/SkMipMap.cpp12
-rw-r--r--src/core/SkRegion_path.cpp16
4 files changed, 66 insertions, 43 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 11c7cbd69c..d4c3a47d81 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -24,6 +24,10 @@
#include "SkPackBits.h"
#include <new>
+static bool isPos32Bits(const Sk64& value) {
+ return !value.isNeg() && value.is32();
+}
+
struct MipLevel {
void* fPixels;
uint32_t fRowBytes;
@@ -40,12 +44,14 @@ struct SkBitmap::MipMap : SkNoncopyable {
if (levelCount < 0) {
return NULL;
}
- int64_t size = (levelCount + 1) * sizeof(MipLevel);
- size += sizeof(MipMap) + pixelSize;
- if (!sk_64_isS32(size)) {
+ Sk64 size;
+ size.setMul(levelCount + 1, sizeof(MipLevel));
+ size.add(sizeof(MipMap));
+ size.add(SkToS32(pixelSize));
+ if (!isPos32Bits(size)) {
return NULL;
}
- MipMap* mm = (MipMap*)sk_malloc_throw(sk_64_asS32(size));
+ MipMap* mm = (MipMap*)sk_malloc_throw(size.get32());
mm->fRefCnt = 1;
mm->fLevelCount = levelCount;
return mm;
@@ -179,49 +185,58 @@ size_t SkBitmap::ComputeRowBytes(Config c, int width) {
return 0;
}
- int64_t rowBytes = 0;
+ Sk64 rowBytes;
+ rowBytes.setZero();
switch (c) {
case kNo_Config:
break;
case kA8_Config:
case kIndex8_Config:
- rowBytes = width;
+ rowBytes.set(width);
break;
case kRGB_565_Config:
case kARGB_4444_Config:
- rowBytes = width << 1;
+ rowBytes.set(width);
+ rowBytes.shiftLeft(1);
break;
case kARGB_8888_Config:
- rowBytes = width << 2;
+ rowBytes.set(width);
+ rowBytes.shiftLeft(2);
break;
default:
SkDEBUGFAIL("unknown config");
break;
}
- return sk_64_isS32(rowBytes) ? sk_64_asS32(rowBytes) : 0;
+ return isPos32Bits(rowBytes) ? rowBytes.get32() : 0;
}
-int64_t SkBitmap::ComputeSize64(Config config, int width, int height) {
- int64_t rowBytes = sk_64_mul(ComputeBytesPerPixel(config), width);
- return rowBytes * height;
+Sk64 SkBitmap::ComputeSize64(Config c, int width, int height) {
+ Sk64 size;
+ size.setMul(SkToS32(SkBitmap::ComputeRowBytes(c, width)), height);
+ return size;
}
size_t SkBitmap::ComputeSize(Config c, int width, int height) {
- int64_t size = SkBitmap::ComputeSize64(c, width, height);
- return sk_64_isS32(size) ? sk_64_asS32(size) : 0;
+ Sk64 size = SkBitmap::ComputeSize64(c, width, height);
+ return isPos32Bits(size) ? size.get32() : 0;
}
-int64_t SkBitmap::ComputeSafeSize64(Config config,
- uint32_t width,
- uint32_t height,
- size_t rowBytes) {
- int64_t safeSize = 0;
+Sk64 SkBitmap::ComputeSafeSize64(Config config,
+ uint32_t width,
+ uint32_t height,
+ size_t rowBytes) {
+ Sk64 safeSize;
+ safeSize.setZero();
if (height > 0) {
- int64_t lastRow = sk_64_mul(ComputeBytesPerPixel(config), width);
- safeSize = sk_64_mul(height - 1, rowBytes) + lastRow;
- }
- SkASSERT(safeSize >= 0);
+ // TODO: Handle the case where the return value from
+ // ComputeRowBytes is more than 31 bits.
+ safeSize.set(SkToS32(ComputeRowBytes(config, width)));
+ Sk64 sizeAllButLastRow;
+ sizeAllButLastRow.setMul(height - 1, SkToS32(rowBytes));
+ safeSize.add(sizeAllButLastRow);
+ }
+ SkASSERT(!safeSize.isNeg());
return safeSize;
}
@@ -229,13 +244,8 @@ size_t SkBitmap::ComputeSafeSize(Config config,
uint32_t width,
uint32_t height,
size_t rowBytes) {
- int64_t safeSize = ComputeSafeSize64(config, width, height, rowBytes);
- int32_t safeSize32 = (int32_t)safeSize;
-
- if (safeSize32 != safeSize) {
- safeSize32 = 0;
- }
- return safeSize32;
+ Sk64 safeSize = ComputeSafeSize64(config, width, height, rowBytes);
+ return (safeSize.is32() ? safeSize.get32() : 0);
}
void SkBitmap::getBounds(SkRect* bounds) const {
@@ -548,6 +558,10 @@ size_t SkBitmap::getSafeSize() const {
ComputeRowBytes(this->config(), fWidth): 0);
}
+Sk64 SkBitmap::getSafeSize64() const {
+ return ComputeSafeSize64(this->config(), fWidth, fHeight, fRowBytes);
+}
+
bool SkBitmap::copyPixelsTo(void* const dst, size_t dstSize,
size_t dstRowBytes, bool preserveDstPad) const {
diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp
index 9e2ea9c980..b65197fac8 100644
--- a/src/core/SkMallocPixelRef.cpp
+++ b/src/core/SkMallocPixelRef.cpp
@@ -64,12 +64,13 @@ SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
rowBytes = minRB;
}
- int64_t bigSize = (int64_t)info.fHeight * rowBytes;
- if (!sk_64_isS32(bigSize)) {
+ Sk64 bigSize;
+ bigSize.setMul(info.fHeight, rowBytes);
+ if (!bigSize.is32()) {
return NULL;
}
- size_t size = sk_64_asS32(bigSize);
+ size_t size = bigSize.get32();
void* addr = sk_malloc_flags(size, 0);
if (NULL == addr) {
return NULL;
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp
index ff62f4d59d..4888b574e4 100644
--- a/src/core/SkMipMap.cpp
+++ b/src/core/SkMipMap.cpp
@@ -109,15 +109,21 @@ static void downsampleby2_proc4444(SkBitmap* dst, int x, int y,
*dst->getAddr16(x >> 1, y >> 1) = (uint16_t)collaps4444(c >> 2);
}
+static bool isPos32Bits(const Sk64& value) {
+ return !value.isNeg() && value.is32();
+}
+
SkMipMap::Level* SkMipMap::AllocLevels(int levelCount, size_t pixelSize) {
if (levelCount < 0) {
return NULL;
}
- int64_t size = sk_64_mul(levelCount + 1, sizeof(Level)) + pixelSize;
- if (!sk_64_isS32(size)) {
+ Sk64 size;
+ size.setMul(levelCount + 1, sizeof(Level));
+ size.add(SkToS32(pixelSize));
+ if (!isPos32Bits(size)) {
return NULL;
}
- return (Level*)sk_malloc_throw(sk_64_asS32(size));
+ return (Level*)sk_malloc_throw(size.get32());
}
SkMipMap* SkMipMap::Build(const SkBitmap& src) {
diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp
index 95247f403e..a20647c966 100644
--- a/src/core/SkRegion_path.cpp
+++ b/src/core/SkRegion_path.cpp
@@ -107,6 +107,8 @@ bool SkRgnBuilder::init(int maxHeight, int maxTransitions, bool pathIsInverse) {
return false;
}
+ Sk64 count, size;
+
if (pathIsInverse) {
// allow for additional X transitions to "invert" each scanline
// [ L' ... normal transitions ... R' ]
@@ -115,25 +117,25 @@ bool SkRgnBuilder::init(int maxHeight, int maxTransitions, bool pathIsInverse) {
}
// compute the count with +1 and +3 slop for the working buffer
- int64_t count = sk_64_mul(maxHeight + 1, 3 + maxTransitions);
+ count.setMul(maxHeight + 1, 3 + maxTransitions);
if (pathIsInverse) {
// allow for two "empty" rows for the top and bottom
// [ Y, 1, L, R, S] == 5 (*2 for top and bottom)
- count += 10;
+ count.add(10);
}
- if (count < 0 || !sk_64_isS32(count)) {
+ if (!count.is32() || count.isNeg()) {
return false;
}
- fStorageCount = sk_64_asS32(count);
+ fStorageCount = count.get32();
- int64_t size = sk_64_mul(fStorageCount, sizeof(SkRegion::RunType));
- if (size < 0 || !sk_64_isS32(size)) {
+ size.setMul(fStorageCount, sizeof(SkRegion::RunType));
+ if (!size.is32() || size.isNeg()) {
return false;
}
- fStorage = (SkRegion::RunType*)sk_malloc_flags(sk_64_asS32(size), 0);
+ fStorage = (SkRegion::RunType*)sk_malloc_flags(size.get32(), 0);
if (NULL == fStorage) {
return false;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 10:41:43 +0000