}
}
}
- SkColorTable* ctable = new SkColorTable(storage, 216);
dst->allocPixels(SkImageInfo::Make(src.width(), src.height(), kIndex_8_SkColorType, aType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(storage, 216));
SkAutoLockPixels alps(src);
SkAutoLockPixels alpd(*dst);
}
}
}
- SkColorTable* ctable = new SkColorTable(storage, 216);
dst->allocPixels(SkImageInfo::Make(src.width(), src.height(),
kIndex_8_SkColorType, kOpaque_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(storage, 216));
SkAutoLockPixels alps(src);
SkAutoLockPixels alpd(*dst);
SkAlphaType alphaType = kPremul_SkAlphaType;
(void)SkColorTypeValidateAlphaType(fColorType, alphaType, &alphaType);
- SkMallocPixelRef::ZeroedPRFactory factory;
dst->allocPixels(SkImageInfo::Make(size.width(), size.height(),
fColorType, alphaType, fColorSpace),
- &factory,
- nullptr/*colortable*/);
+ nullptr/*colortable*/, SkBitmap::kZeroPixels_AllocFlag);
SkCanvas canvas(*dst);
return src.draw(&canvas);
}
}
SkBitmap bitmap;
- SkMallocPixelRef::ZeroedPRFactory zeroFactory;
SkCodec::Options options;
options.fZeroInitialized = SkCodec::kYes_ZeroInitialized;
- if (!bitmap.tryAllocPixels(decodeInfo, &zeroFactory, colorTable.get())) {
+ if (!bitmap.tryAllocPixels(decodeInfo, colorTable, SkBitmap::kZeroPixels_AllocFlag)) {
SkDebugf("[terminated] Could not allocate memory. Image might be too large (%d x %d)",
decodeInfo.width(), decodeInfo.height());
return;
pmColors[i] = premultiply_color(colors[i]);
}
SkBitmap bm;
- sk_sp<SkColorTable> ctable(new SkColorTable(pmColors, SK_ARRAY_COUNT(pmColors)));
SkImageInfo info = SkImageInfo::Make(SCALE, SCALE, kIndex_8_SkColorType,
kPremul_SkAlphaType);
- bm.allocPixels(info, nullptr, ctable.get());
+ bm.allocPixels(info, SkColorTable::Make(pmColors, SK_ARRAY_COUNT(pmColors)));
SkAutoLockPixels autoLockPixels1(n32bitmap);
SkAutoLockPixels autoLockPixels2(bm);
for (int y = 0; y < SCALE; ++y) {
for (size_t i = 0; i < SK_ARRAY_COUNT(colors); ++i) {
colorsPM[i] = SkPreMultiplyColor(colors[i]);
}
- SkColorTable* ctable = new SkColorTable(colorsPM, 4);
-
bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType,
kPremul_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(colorsPM, 4));
*bm->getAddr8(0, 0) = 0;
*bm->getAddr8(1, 0) = 1;
pmColors[i] = toPMColor(colors[i]);
}
- sk_sp<SkColorTable> colorTable(new SkColorTable(pmColors, SK_ARRAY_COUNT(pmColors)));
SkImageInfo info = SkImageInfo::Make(imageWidth, imageHeight, kIndex_8_SkColorType,
alphaType, colorSpace);
- bitmap->allocPixels(info, nullptr, colorTable.get());
+ bitmap->allocPixels(info, SkColorTable::Make(pmColors, SK_ARRAY_COUNT(pmColors)));
for (int y = 0; y < imageHeight; y++) {
for (int x = 0; x < imageWidth; x++) {
*bitmap->getAddr8(x, y) = (x / div_round_up(imageWidth, 2)) +
SkImageInfo info = SkImageInfo::Make(100, 100, kIndex_8_SkColorType, kPremul_SkAlphaType);
SkBitmap bm2;
- sk_sp<SkColorTable> ct(new SkColorTable(colors, count));
- bm2.allocPixels(info, nullptr, ct.get());
+ bm2.allocPixels(info, SkColorTable::Make(colors, count));
for (int y = 0; y < info.height(); ++y) {
for (int x = 0; x < info.width(); ++x) {
*bm2.getAddr8(x, y) = find_closest(*bm.getAddr32(x, y), colors, count);
static SkBitmap make_bitmap() {
const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) };
- SkColorTable* ctable = new SkColorTable(c, SK_ARRAY_COUNT(c));
SkBitmap bm;
bm.allocPixels(SkImageInfo::Make(1, 1, kIndex_8_SkColorType,
kPremul_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(c, SK_ARRAY_COUNT(c)));
bm.lockPixels();
*bm.getAddr8(0, 0) = 0;
"SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
"SK_SUPPORT_LEGACY_CANVAS_HELPERS",
"SK_SUPPORT_LEGACY_CANVAS_VERTICES",
+ "SK_SUPPORT_LEGACY_PIXELREFFACTORY",
]
bool setInfo(const SkImageInfo&, size_t rowBytes = 0);
+ enum AllocFlags {
+ kZeroPixels_AllocFlag = 1 << 0,
+ };
/**
* Allocate the bitmap's pixels to match the requested image info. If the Factory
* is non-null, call it to allcoate the pixelref. If the ImageInfo requires
- * a colortable, then ColorTable must be non-null, and will be ref'd.
+ * a colortable, then ColorTable must be non-null.
+ *
* On failure, the bitmap will be set to empty and return false.
*/
- bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);
-
- void allocPixels(const SkImageInfo& info, SkPixelRefFactory* factory, SkColorTable* ctable) {
- if (!this->tryAllocPixels(info, factory, ctable)) {
+ bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo& info, sk_sp<SkColorTable> ctable,
+ uint32_t flags = 0);
+ void allocPixels(const SkImageInfo& info, sk_sp<SkColorTable> ctable, uint32_t flags = 0) {
+ if (!this->tryAllocPixels(info, std::move(ctable), flags)) {
sk_throw();
}
}
+ // TEMPORARY -- remove after updating Android BitmapTests.cpp:35
+ void allocPixels(const SkImageInfo& info, std::nullptr_t, SkColorTable* ctable) {
+ this->allocPixels(info, sk_ref_sp(ctable));
+ }
+
/**
* Allocate the bitmap's pixels to match the requested image info and
* rowBytes. If the request cannot be met (e.g. the info is invalid or
*/
class SK_API SkColorTable : public SkRefCnt {
public:
+ static sk_sp<SkColorTable> Make(const SkPMColor colors[], int count);
+
/** Copy up to 256 colors into a new SkColorTable.
*/
SkColorTable(const SkPMColor colors[], int count);
- virtual ~SkColorTable();
+ ~SkColorTable() override;
/** Returns the number of colors in the table.
*/
void writeToBuffer(SkWriteBuffer&) const;
// may return null
- static SkColorTable* Create(SkReadBuffer&);
+ static sk_sp<SkColorTable> Create(SkReadBuffer&);
private:
enum AllocatedWithMalloc {
* lifetime of the pixel storage buffer, as this pixelref will not try
* to delete it.
*
- * The pixelref will ref() the colortable (if not NULL).
- *
* Returns NULL on failure.
*/
- static SkMallocPixelRef* NewDirect(const SkImageInfo&, void* addr,
- size_t rowBytes, SkColorTable*);
+ static sk_sp<SkPixelRef> MakeDirect(const SkImageInfo&, void* addr,
+ size_t rowBytes, sk_sp<SkColorTable>);
/**
* Return a new SkMallocPixelRef, automatically allocating storage for the
*
* Returns NULL on failure.
*/
- static SkMallocPixelRef* NewAllocate(const SkImageInfo& info,
- size_t rowBytes, SkColorTable*);
+ static sk_sp<SkPixelRef> MakeAllocate(const SkImageInfo&, size_t rowBytes, sk_sp<SkColorTable>);
/**
- * Identical to NewAllocate, except all pixel bytes are zeroed.
+ * Identical to MakeAllocate, except all pixel bytes are zeroed.
*/
- static SkMallocPixelRef* NewZeroed(const SkImageInfo& info,
- size_t rowBytes, SkColorTable*);
+ static sk_sp<SkPixelRef> MakeZeroed(const SkImageInfo&, size_t rowBytes, sk_sp<SkColorTable>);
/**
* Return a new SkMallocPixelRef with the provided pixel storage,
* rowBytes, and optional colortable. On destruction, ReleaseProc
* will be called.
*
- * This pixelref will ref() the specified colortable (if not NULL).
- *
* If ReleaseProc is NULL, the pixels will never be released. This
* can be useful if the pixels were stack allocated. However, such an
* SkMallocPixelRef must not live beyond its pixels (e.g. by copying
* Returns NULL on failure.
*/
typedef void (*ReleaseProc)(void* addr, void* context);
- static SkMallocPixelRef* NewWithProc(const SkImageInfo& info,
- size_t rowBytes, SkColorTable*,
- void* addr, ReleaseProc proc,
- void* context);
+ static sk_sp<SkPixelRef> MakeWithProc(const SkImageInfo& info,
+ size_t rowBytes, sk_sp<SkColorTable>,
+ void* addr, ReleaseProc proc,
+ void* context);
/**
* Return a new SkMallocPixelRef that will use the provided
* The SkData will be ref()ed and on destruction of the PielRef,
* the SkData will be unref()ed.
*
- * This pixelref will ref() the specified colortable (if not NULL).
- *
* Returns NULL on failure.
*/
+ static sk_sp<SkPixelRef> MakeWithData(const SkImageInfo& info,
+ size_t rowBytes,
+ sk_sp<SkColorTable>,
+ sk_sp<SkData> data);
+
+#ifdef SK_SUPPORT_LEGACY_PIXELREFFACTORY
+ static SkMallocPixelRef* NewDirect(const SkImageInfo& info, void* addr,
+ size_t rowBytes, SkColorTable* ctable) {
+ return (SkMallocPixelRef*)MakeDirect(info, addr, rowBytes, sk_ref_sp(ctable)).release();
+ }
+ static SkMallocPixelRef* NewAllocate(const SkImageInfo& info, size_t rb, SkColorTable* ct) {
+ return (SkMallocPixelRef*)MakeAllocate(info, rb, sk_ref_sp(ct)).release();
+ }
+ static SkMallocPixelRef* NewZeroed(const SkImageInfo& info, size_t rowBytes, SkColorTable* ct) {
+ return (SkMallocPixelRef*)MakeZeroed(info, rowBytes, sk_ref_sp(ct)).release();
+ }
+ static SkMallocPixelRef* NewWithProc(const SkImageInfo& info,
+ size_t rowBytes, SkColorTable* ctable,
+ void* addr, ReleaseProc proc,
+ void* ctx) {
+ return (SkMallocPixelRef*)MakeWithProc(info, rowBytes, sk_ref_sp(ctable), addr, proc, ctx).release();
+ }
static SkMallocPixelRef* NewWithData(const SkImageInfo& info,
size_t rowBytes,
SkColorTable* ctable,
SkData* data);
+#endif
void* getAddr() const { return fStorage; }
- class PRFactory : public SkPixelRefFactory {
- public:
- SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override;
- };
-
- class ZeroedPRFactory : public SkPixelRefFactory {
- public:
- SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override;
- };
-
protected:
// The ownPixels version of this constructor is deprecated.
SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
private:
// Uses alloc to implement NewAllocate or NewZeroed.
- static SkMallocPixelRef* NewUsing(void*(*alloc)(size_t),
- const SkImageInfo&,
- size_t rowBytes,
- SkColorTable*);
-
- void* fStorage;
- SkColorTable* fCTable;
- size_t fRB;
- ReleaseProc fReleaseProc;
- void* fReleaseProcContext;
-
- SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
+ static sk_sp<SkPixelRef> MakeUsing(void*(*alloc)(size_t),
+ const SkImageInfo&,
+ size_t rowBytes,
+ sk_sp<SkColorTable>);
+
+ void* fStorage;
+ sk_sp<SkColorTable> fCTable;
+ size_t fRB;
+ ReleaseProc fReleaseProc;
+ void* fReleaseProcContext;
+
+ SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, sk_sp<SkColorTable>,
ReleaseProc proc, void* context);
typedef SkPixelRef INHERITED;
# Temporarily Disable analytic AA for Google3
"SK_NO_ANALYTIC_AA",
"SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
+ "SK_SUPPORT_LEGACY_PIXELREFFACTORY",
]
################################################################################
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "SampleCode.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
}
SkBitmap bm;
- SkColorTable* ctable = new SkColorTable(c, 256);
-
bm.allocPixels(SkImageInfo::Make(256, 256, kIndex_8_SkColorType,
kPremul_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(c, 256));
bm.lockPixels();
const float cx = bm.width() * 0.5f;
for (int i = 0; i < 256; i++) {
c[i] = SkPackARGB32(0xFF, i, 0, 0);
}
- SkColorTable* ctable = new SkColorTable(c, 256);
-
SkBitmap bm;
bm.allocPixels(SkImageInfo::Make(256, 32, kIndex_8_SkColorType, kPremul_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(c, 256));
bm.lockPixels();
for (int y = 0; y < bm.height(); y++) {
SkPreMultiplyColor(SK_ColorRED), SkPreMultiplyColor(SK_ColorGREEN),
SkPreMultiplyColor(SK_ColorBLUE), SkPreMultiplyColor(SK_ColorWHITE)
};
- SkColorTable* ctable = new SkColorTable(colors, 4);
bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType,
kOpaque_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(colors, 4));
*bm->getAddr8(0, 0) = 0;
*bm->getAddr8(1, 0) = 1;
for (int i = 0; i < N; i++) {
c[i] = SkPackARGB32(0x80, 0x80, 0, 0);
}
- SkColorTable* ctable = new SkColorTable(c, N);
SkBitmap bm;
bm.allocPixels(SkImageInfo::Make(1, 1, kIndex_8_SkColorType,
kPremul_SkAlphaType),
- nullptr, ctable);
- ctable->unref();
+ SkColorTable::Make(c, N));
bm.lockPixels();
for (int y = 0; y < bm.height(); y++) {
return;
}
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewDirect(fInfo, p, fRowBytes, ctable));
- this->setPixelRef(std::move(pr), 0, 0);
+ this->setPixelRef(SkMallocPixelRef::MakeDirect(fInfo, p, fRowBytes, sk_ref_sp(ctable)), 0, 0);
if (!fPixelRef) {
return;
}
// setInfo may have computed a valid rowbytes if 0 were passed in
rowBytes = this->rowBytes();
- SkMallocPixelRef::PRFactory defaultFactory;
-
- sk_sp<SkPixelRef> pr(defaultFactory.create(correctedInfo, rowBytes, nullptr));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeAllocate(correctedInfo, rowBytes, nullptr);
if (!pr) {
return reset_return_false(this);
}
return true;
}
-bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, SkPixelRefFactory* factory,
- SkColorTable* ctable) {
+bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, sk_sp<SkColorTable> ctable,
+ uint32_t allocFlags) {
if (kIndex_8_SkColorType == requestedInfo.colorType() && nullptr == ctable) {
return reset_return_false(this);
}
// setInfo may have corrected info (e.g. 565 is always opaque).
const SkImageInfo& correctedInfo = this->info();
- SkMallocPixelRef::PRFactory defaultFactory;
- if (nullptr == factory) {
- factory = &defaultFactory;
- }
-
- sk_sp<SkPixelRef> pr(factory->create(correctedInfo, correctedInfo.minRowBytes(), ctable));
+ sk_sp<SkPixelRef> pr = (allocFlags & kZeroPixels_AllocFlag) ?
+ SkMallocPixelRef::MakeZeroed(correctedInfo, correctedInfo.minRowBytes(), ctable) :
+ SkMallocPixelRef::MakeAllocate(correctedInfo, correctedInfo.minRowBytes(), ctable);
if (!pr) {
return reset_return_false(this);
}
this->setPixelRef(std::move(pr), 0, 0);
- // TODO: lockPixels could/should return bool or void*/nullptr
this->lockPixels();
if (nullptr == this->getPixels()) {
return reset_return_false(this);
// setInfo may have corrected info (e.g. 565 is always opaque).
const SkImageInfo& correctedInfo = this->info();
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewWithProc(correctedInfo, rb, ct, pixels, releaseProc,
- context));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeWithProc(correctedInfo, rb, sk_ref_sp(ct),
+ pixels, releaseProc, context);
if (!pr) {
this->reset();
return false;
return false;
}
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, dst->rowBytes(), ctable));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeAllocate(info, dst->rowBytes(), sk_ref_sp(ctable));
if (!pr) {
return false;
}
sk_sp<SkColorTable> ctable;
if (buffer->readBool()) {
- ctable.reset(SkColorTable::Create(*buffer));
+ ctable = SkColorTable::Create(*buffer);
if (!ctable) {
return false;
}
}
}
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),
- ctable.get(), data.get()));
- if (!pr.get()) {
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeWithData(info, info.minRowBytes(),
+ std::move(ctable), std::move(data));
+ if (!pr) {
return false;
}
bitmap->setInfo(pr->info());
}
} else {
// This bitmap has transparency, so we'll zero the pixels (to transparent).
- // We use a ZeroedPRFactory as a faster alloc-then-eraseColor(SK_ColorTRANSPARENT).
- SkMallocPixelRef::ZeroedPRFactory factory;
- if (!bitmap.tryAllocPixels(info, &factory, nullptr/*color table*/)) {
+ // We use the flag as a faster alloc-then-eraseColor(SK_ColorTRANSPARENT).
+ if (!bitmap.tryAllocPixels(info, nullptr/*colortable*/, SkBitmap::kZeroPixels_AllocFlag)) {
return nullptr;
}
}
SkColorTable::SkColorTable(const SkPMColor colors[], int count) {
SkASSERT(0 == count || colors);
- if (count < 0) {
- count = 0;
- } else if (count > 256) {
- count = 256;
- }
+ SkASSERT(count >= 0 && count <= 256);
this->init(colors, count);
}
return f16BitCache;
}
+sk_sp<SkColorTable> SkColorTable::Make(const SkPMColor colors[], int count) {
+ if (count < 0 || count > 256) {
+ return nullptr;
+ }
+ if (count && !colors) {
+ return nullptr;
+ }
+ return sk_make_sp<SkColorTable>(colors, count);
+}
+
///////////////////////////////////////////////////////////////////////////////
#if 0
buffer.writeColorArray(fColors, fCount);
}
-SkColorTable* SkColorTable::Create(SkReadBuffer& buffer) {
+sk_sp<SkColorTable> SkColorTable::Create(SkReadBuffer& buffer) {
if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
/*fAlphaType = */buffer.readUInt();
}
const int count = buffer.getArrayCount();
if (0 == count) {
- return new SkColorTable(nullptr, 0);
+ return sk_sp<SkColorTable>(new SkColorTable(nullptr, 0));
}
if (count < 0 || count > 256) {
return nullptr;
}
- return new SkColorTable(colors.release(), count, kAllocatedWithMalloc);
+ return sk_sp<SkColorTable>(new SkColorTable(colors.release(), count, kAllocatedWithMalloc));
}
allocator)) {
return false;
}
- if (!bitmap->tryAllocPixels(decodeInfo, nullptr, full.getColorTable())) {
+ if (!bitmap->tryAllocPixels(decodeInfo, sk_ref_sp(full.getColorTable()))) {
return false;
}
return full.readPixels(bitmap->info(), bitmap->getPixels(), bitmap->rowBytes(),
return true;
}
-SkMallocPixelRef* SkMallocPixelRef::NewDirect(const SkImageInfo& info,
- void* addr,
- size_t rowBytes,
- SkColorTable* ctable) {
- if (!is_valid(info, ctable)) {
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeDirect(const SkImageInfo& info,
+ void* addr,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, nullptr, nullptr);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ nullptr, nullptr));
}
- SkMallocPixelRef* SkMallocPixelRef::NewUsing(void*(*alloc)(size_t),
- const SkImageInfo& info,
- size_t requestedRowBytes,
- SkColorTable* ctable) {
- if (!is_valid(info, ctable)) {
+ sk_sp<SkPixelRef> SkMallocPixelRef::MakeUsing(void*(*alloc)(size_t),
+ const SkImageInfo& info,
+ size_t requestedRowBytes,
+ sk_sp<SkColorTable> ctable) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, sk_free_releaseproc, nullptr);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ sk_free_releaseproc, nullptr));
}
-SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeAllocate(const SkImageInfo& info,
size_t rowBytes,
- SkColorTable* ctable) {
+ sk_sp<SkColorTable> ctable) {
auto sk_malloc_nothrow = [](size_t size) { return sk_malloc_flags(size, 0); };
- return NewUsing(sk_malloc_nothrow, info, rowBytes, ctable);
+ return MakeUsing(sk_malloc_nothrow, info, rowBytes, std::move(ctable));
}
-SkMallocPixelRef* SkMallocPixelRef::NewZeroed(const SkImageInfo& info,
- size_t rowBytes,
- SkColorTable* ctable) {
- return NewUsing(sk_calloc, info, rowBytes, ctable);
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeZeroed(const SkImageInfo& info,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable) {
+ return MakeUsing(sk_calloc, info, rowBytes, std::move(ctable));
}
-SkMallocPixelRef* SkMallocPixelRef::NewWithProc(const SkImageInfo& info,
- size_t rowBytes,
- SkColorTable* ctable,
- void* addr,
- SkMallocPixelRef::ReleaseProc proc,
- void* context) {
- if (!is_valid(info, ctable)) {
+static void sk_data_releaseproc(void*, void* dataPtr) {
+ (static_cast<SkData*>(dataPtr))->unref();
+}
+
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeWithProc(const SkImageInfo& info,
+ size_t rowBytes,
+ sk_sp<SkColorTable> ctable,
+ void* addr,
+ SkMallocPixelRef::ReleaseProc proc,
+ void* context) {
+ if (!is_valid(info, ctable.get())) {
if (proc) {
proc(addr, context);
}
return nullptr;
}
- return new SkMallocPixelRef(info, addr, rowBytes, ctable, proc, context);
+ return sk_sp<SkPixelRef>(new SkMallocPixelRef(info, addr, rowBytes, std::move(ctable),
+ proc, context));
}
-static void sk_data_releaseproc(void*, void* dataPtr) {
- (static_cast<SkData*>(dataPtr))->unref();
-}
-
-SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
+sk_sp<SkPixelRef> SkMallocPixelRef::MakeWithData(const SkImageInfo& info,
size_t rowBytes,
- SkColorTable* ctable,
- SkData* data) {
+ sk_sp<SkColorTable> ctable,
+ sk_sp<SkData> data) {
SkASSERT(data != nullptr);
- if (!is_valid(info, ctable)) {
+ if (!is_valid(info, ctable.get())) {
return nullptr;
}
if ((rowBytes < info.minRowBytes())
|| (data->size() < info.getSafeSize(rowBytes))) {
return nullptr;
}
- data->ref();
- SkMallocPixelRef* pr =
- new SkMallocPixelRef(info, const_cast<void*>(data->data()), rowBytes, ctable,
- sk_data_releaseproc, static_cast<void*>(data));
- SkASSERT(pr != nullptr);
- // We rely on the immutability of the pixels to make the
- // const_cast okay.
- pr->setImmutable();
- return pr;
+ // must get this address before we call release
+ void* pixels = const_cast<void*>(data->data());
+ SkPixelRef* pr = new SkMallocPixelRef(info, pixels, rowBytes, std::move(ctable),
+ sk_data_releaseproc, data.release());
+ pr->setImmutable(); // since we were created with (immutable) data
+ return sk_sp<SkPixelRef>(pr);
}
///////////////////////////////////////////////////////////////////////////////
size_t rowBytes, SkColorTable* ctable,
bool ownsPixels)
: INHERITED(info)
+ , fCTable(sk_ref_sp(ctable))
, fReleaseProc(ownsPixels ? sk_free_releaseproc : nullptr)
, fReleaseProcContext(nullptr) {
// This constructor is now DEPRICATED.
- SkASSERT(is_valid(info, ctable));
+ SkASSERT(is_valid(info, fCTable.get()));
SkASSERT(rowBytes >= info.minRowBytes());
if (kIndex_8_SkColorType != info.colorType()) {
- ctable = nullptr;
+ fCTable = nullptr;
}
fStorage = storage;
- fCTable = ctable;
fRB = rowBytes;
- SkSafeRef(ctable);
- this->setPreLocked(fStorage, rowBytes, fCTable);
+ this->setPreLocked(fStorage, rowBytes, fCTable.get());
}
SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
- size_t rowBytes, SkColorTable* ctable,
+ size_t rowBytes, sk_sp<SkColorTable> ctable,
SkMallocPixelRef::ReleaseProc proc,
void* context)
: INHERITED(info)
, fReleaseProc(proc)
, fReleaseProcContext(context)
{
- SkASSERT(is_valid(info, ctable));
+ SkASSERT(is_valid(info, ctable.get()));
SkASSERT(rowBytes >= info.minRowBytes());
if (kIndex_8_SkColorType != info.colorType()) {
- ctable = nullptr;
+ ctable.reset(nullptr);
}
fStorage = storage;
- fCTable = ctable;
+ fCTable = std::move(ctable);
fRB = rowBytes;
- SkSafeRef(ctable);
- this->setPreLocked(fStorage, rowBytes, fCTable);
+ this->setPreLocked(fStorage, rowBytes, fCTable.get());
}
SkMallocPixelRef::~SkMallocPixelRef() {
- SkSafeUnref(fCTable);
if (fReleaseProc != nullptr) {
fReleaseProc(fStorage, fReleaseProcContext);
}
bool SkMallocPixelRef::onNewLockPixels(LockRec* rec) {
rec->fPixels = fStorage;
rec->fRowBytes = fRB;
- rec->fColorTable = fCTable;
+ rec->fColorTable = fCTable.get();
return true;
}
return this->info().getSafeSize(fRB);
}
-///////////////////////////////////////////////////////////////////////////////
-
-SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, size_t rowBytes,
- SkColorTable* ctable) {
- return SkMallocPixelRef::NewAllocate(info, rowBytes, ctable);
-}
-
-SkPixelRef* SkMallocPixelRef::ZeroedPRFactory::create(const SkImageInfo& info, size_t rowBytes,
- SkColorTable* ctable) {
- return SkMallocPixelRef::NewZeroed(info, rowBytes, ctable);
+#ifdef SK_SUPPORT_LEGACY_PIXELREFFACTORY
+SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
+ size_t rowBytes,
+ SkColorTable* ctable,
+ SkData* data) {
+ return (SkMallocPixelRef*)MakeWithData(info, rowBytes, sk_ref_sp(ctable), sk_ref_sp(data)).release();
}
+#endif
sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRaster(const SkImageInfo& info,
const SkSurfaceProps* props) {
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewZeroed(info, 0, nullptr));
- if (nullptr == pr.get()) {
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeZeroed(info, 0, nullptr);
+ if (!pr) {
return nullptr;
}
#include "SkGradientShaderPriv.h"
#include "SkHalf.h"
#include "SkLinearGradient.h"
+#include "SkMallocPixelRef.h"
#include "SkRadialGradient.h"
#include "SkTwoPointConicalGradient.h"
#include "SkSweepGradient.h"
{
// Only initialize the cache in getCache32.
fCache32 = nullptr;
- fCache32PixelRef = nullptr;
}
-SkGradientShaderBase::GradientShaderCache::~GradientShaderCache() {
- SkSafeUnref(fCache32PixelRef);
-}
+SkGradientShaderBase::GradientShaderCache::~GradientShaderCache() {}
/*
* r,g,b used to be SkFixed, but on gcc (4.2.1 mac and 4.6.3 goobuntu) in
const SkImageInfo info = SkImageInfo::MakeN32Premul(kCache32Count, kNumberOfDitherRows);
SkASSERT(nullptr == cache->fCache32PixelRef);
- cache->fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, nullptr);
- cache->fCache32 = (SkPMColor*)cache->fCache32PixelRef->getAddr();
+ cache->fCache32PixelRef = SkMallocPixelRef::MakeAllocate(info, 0, nullptr);
+ cache->fCache32 = (SkPMColor*)cache->fCache32PixelRef->pixels();
if (cache->fShader.fColorCount == 2) {
Build32bitCache(cache->fCache32, cache->fShader.fOrigColors[0],
cache->fShader.fOrigColors[1], kCache32Count, cache->fCacheAlpha,
#include "SkClampRange.h"
#include "SkColorPriv.h"
#include "SkColorSpace.h"
-#include "SkMallocPixelRef.h"
#include "SkOnce.h"
#include "SkReadBuffer.h"
#include "SkShader.h"
const SkPMColor* getCache32();
- SkMallocPixelRef* getCache32PixelRef() const { return fCache32PixelRef; }
+ SkPixelRef* getCache32PixelRef() const { return fCache32PixelRef.get(); }
unsigned getAlpha() const { return fCacheAlpha; }
bool getDither() const { return fCacheDither; }
// Working pointer. If it's nullptr, we need to recompute the cache values.
SkPMColor* fCache32;
- SkMallocPixelRef* fCache32PixelRef;
+ sk_sp<SkPixelRef> fCache32PixelRef;
const unsigned fCacheAlpha; // The alpha value we used when we computed the cache.
// Larger than 8bits so we can store uninitialized
// value.
return nullptr;
}
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewZeroed(info, rowBytes, nullptr));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeZeroed(info, rowBytes, nullptr);
if (!pr) {
return nullptr;
}
}
}
-static SkColorTable* init_ctable() {
+static sk_sp<SkColorTable> init_ctable() {
static const SkColor colors[] = {
SK_ColorBLACK, SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE
};
- return new SkColorTable(colors, SK_ARRAY_COUNT(colors));
+ return SkColorTable::Make(colors, SK_ARRAY_COUNT(colors));
}
struct Pair {
static void setup_src_bitmaps(SkBitmap* srcOpaque, SkBitmap* srcPremul,
SkColorType ct) {
- SkColorTable* ctable = nullptr;
+ sk_sp<SkColorTable> ctable;
if (kIndex_8_SkColorType == ct) {
ctable = init_ctable();
}
- srcOpaque->allocPixels(SkImageInfo::Make(W, H, ct, kOpaque_SkAlphaType),
- nullptr, ctable);
- srcPremul->allocPixels(SkImageInfo::Make(W, H, ct, kPremul_SkAlphaType),
- nullptr, ctable);
- SkSafeUnref(ctable);
+ srcOpaque->allocPixels(SkImageInfo::Make(W, H, ct, kOpaque_SkAlphaType), ctable);
+ srcPremul->allocPixels(SkImageInfo::Make(W, H, ct, kPremul_SkAlphaType), ctable);
init_src(*srcOpaque);
init_src(*srcPremul);
}
// Create bitmap to act as source for copies and subsets.
SkBitmap src, subset;
- SkColorTable* ct = nullptr;
+ sk_sp<SkColorTable> ct;
if (kIndex_8_SkColorType == src.colorType()) {
ct = init_ctable();
}
kPremul_SkAlphaType))) {
// failure is fine, as we will notice later on
}
- SkSafeUnref(ct);
// Either copy src or extract into 'subset', which is used
// for subsequent calls to copyPixelsTo/From.
SkBitmap bm;
REPORTER_ASSERT(reporter, !bm.tryAllocPixels(info));
- SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), nullptr);
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeAllocate(info, info.minRowBytes(), nullptr);
REPORTER_ASSERT(reporter, !pr);
}
colorCountPtr = &maxColors;
}
- bm->allocPixels(codec->getInfo(), nullptr, colorTable.get());
+ bm->allocPixels(codec->getInfo(), colorTable);
const SkCodec::Result result = codec->getPixels(codec->getInfo(), bm->getPixels(),
bm->rowBytes(), nullptr, colorPtr, colorCountPtr);
return result == SkCodec::kSuccess || result == SkCodec::kIncompleteInput;
} else if (SkCodec::kUnimplemented == result) {
// New method should be supported:
SkBitmap bm;
- sk_sp<SkColorTable> colorTable(new SkColorTable(colorStorage, 256));
- bm.allocPixels(info, nullptr, colorTable.get());
+ bm.allocPixels(info, SkColorTable::Make(colorStorage, 256));
result = decoder->startIncrementalDecode(info, bm.getPixels(), bm.rowBytes(), nullptr,
colorStorage, &colorCount);
REPORTER_ASSERT(r, SkCodec::kSuccess == result);
static void check_round_trip(skiatest::Reporter* r, SkCodec* origCodec, const SkImageInfo& info) {
SkBitmap bm1;
SkPMColor colors[256];
- sk_sp<SkColorTable> colorTable1(new SkColorTable(colors, 256));
- bm1.allocPixels(info, nullptr, colorTable1.get());
+ sk_sp<SkColorTable> colorTable1 = SkColorTable::Make(colors, 256);
+ bm1.allocPixels(info, colorTable1);
int numColors;
SkCodec::Result result = origCodec->getPixels(info, bm1.getPixels(), bm1.rowBytes(), nullptr,
const_cast<SkPMColor*>(colorTable1->readColors()),
REPORTER_ASSERT(r, alpha_type_match(info.alphaType(), codec->getInfo().alphaType()));
SkBitmap bm2;
- sk_sp<SkColorTable> colorTable2(new SkColorTable(colors, 256));
- bm2.allocPixels(info, nullptr, colorTable2.get());
+ sk_sp<SkColorTable> colorTable2 = SkColorTable::Make(colors, 256);
+ bm2.allocPixels(info, colorTable2);
result = codec->getPixels(info, bm2.getPixels(), bm2.rowBytes(), nullptr,
const_cast<SkPMColor*>(colorTable2->readColors()), &numColors);
REPORTER_ASSERT(r, SkCodec::kSuccess == result);
options.fColorCount = colorCountPtr;
SkBitmap bm;
- bm.allocPixels(codec->getInfo(), nullptr, colorTable.get());
+ bm.allocPixels(codec->getInfo(), colorTable);
const SkCodec::Result result = codec->getAndroidPixels(codec->getInfo(), bm.getPixels(),
bm.rowBytes(), &options);
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
DEF_TEST(ImageFromIndex8Bitmap, r) {
SkPMColor pmColors[1] = {SkPreMultiplyColor(SK_ColorWHITE)};
SkBitmap bm;
- sk_sp<SkColorTable> ctable( new SkColorTable(pmColors, SK_ARRAY_COUNT(pmColors)));
SkImageInfo info = SkImageInfo::Make(1, 1, kIndex_8_SkColorType, kPremul_SkAlphaType);
- bm.allocPixels(info, nullptr, ctable.get());
- SkAutoLockPixels autoLockPixels(bm);
+ bm.allocPixels(info, SkColorTable::Make(pmColors, SK_ARRAY_COUNT(pmColors)));
*bm.getAddr8(0, 0) = 0;
sk_sp<SkImage> img(SkImage::MakeFromBitmap(bm));
REPORTER_ASSERT(r, img != nullptr);
REPORTER_ASSERT(reporter, true);
SkImageInfo info = SkImageInfo::MakeN32Premul(10, 13);
{
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewAllocate(info, info.minRowBytes() - 1, nullptr));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeAllocate(info, info.minRowBytes() - 1, nullptr));
// rowbytes too small.
REPORTER_ASSERT(reporter, nullptr == pr.get());
}
size_t rowBytes = info.minRowBytes() - 1;
size_t size = info.getSafeSize(rowBytes);
sk_sp<SkData> data(SkData::MakeUninitialized(size));
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithData(info, rowBytes, nullptr, data.get()));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithData(info, rowBytes, nullptr, data));
// rowbytes too small.
REPORTER_ASSERT(reporter, nullptr == pr.get());
}
size_t rowBytes = info.minRowBytes() + 2;
size_t size = info.getSafeSize(rowBytes) - 1;
sk_sp<SkData> data(SkData::MakeUninitialized(size));
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithData(info, rowBytes, nullptr, data.get()));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithData(info, rowBytes, nullptr, data));
// data too small.
REPORTER_ASSERT(reporter, nullptr == pr.get());
}
size_t size = info.getSafeSize(rowBytes) + 9;
{
SkAutoMalloc memory(size);
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewDirect(info, memory.get(), rowBytes, nullptr));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeDirect(info, memory.get(), rowBytes, nullptr));
REPORTER_ASSERT(reporter, pr.get() != nullptr);
REPORTER_ASSERT(reporter, memory.get() == pr->pixels());
}
{
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewAllocate(info, rowBytes, nullptr));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeAllocate(info, rowBytes, nullptr));
REPORTER_ASSERT(reporter, pr.get() != nullptr);
REPORTER_ASSERT(reporter, pr->pixels());
}
{
void* addr = static_cast<void*>(new uint8_t[size]);
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithProc(info, rowBytes, nullptr, addr,
- delete_uint8_proc, nullptr));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithProc(info, rowBytes, nullptr, addr,
+ delete_uint8_proc, nullptr));
REPORTER_ASSERT(reporter, pr.get() != nullptr);
REPORTER_ASSERT(reporter, addr == pr->pixels());
}
{
int x = 0;
SkAutoMalloc memory(size);
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithProc(info, rowBytes, nullptr,
- memory.get(), set_to_one_proc,
- static_cast<void*>(&x)));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithProc(info, rowBytes, nullptr,
+ memory.get(), set_to_one_proc,
+ static_cast<void*>(&x)));
REPORTER_ASSERT(reporter, pr.get() != nullptr);
REPORTER_ASSERT(reporter, memory.get() == pr->pixels());
REPORTER_ASSERT(reporter, 0 == x);
{
int x = 0;
SkAutoMalloc memory(size);
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithProc(SkImageInfo::MakeN32Premul(-1, -1), rowBytes, nullptr,
- memory.get(), set_to_one_proc,
- static_cast<void*>(&x)));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithProc(SkImageInfo::MakeN32Premul(-1, -1), rowBytes, nullptr,
+ memory.get(), set_to_one_proc,
+ static_cast<void*>(&x)));
REPORTER_ASSERT(reporter, pr.get() == nullptr);
// make sure that set_to_one_proc was called.
REPORTER_ASSERT(reporter, 1 == x);
{
void* addr = static_cast<void*>(new uint8_t[size]);
REPORTER_ASSERT(reporter, addr != nullptr);
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithProc(info, rowBytes, nullptr, addr,
- delete_uint8_proc, nullptr));
+ sk_sp<SkPixelRef> pr(
+ SkMallocPixelRef::MakeWithProc(info, rowBytes, nullptr, addr,
+ delete_uint8_proc, nullptr));
REPORTER_ASSERT(reporter, addr == pr->pixels());
}
{
sk_sp<SkData> data(SkData::MakeUninitialized(size));
SkData* dataPtr = data.get();
REPORTER_ASSERT(reporter, dataPtr->unique());
- sk_sp<SkMallocPixelRef> pr(
- SkMallocPixelRef::NewWithData(info, rowBytes, nullptr, data.get()));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeWithData(info, rowBytes, nullptr, data);
REPORTER_ASSERT(reporter, !(dataPtr->unique()));
data.reset(nullptr);
REPORTER_ASSERT(reporter, dataPtr->unique());
DEF_TEST(PixelRef_GenIDChange, r) {
SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
- sk_sp<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, nullptr));
+ sk_sp<SkPixelRef> pixelRef = SkMallocPixelRef::MakeAllocate(info, 0, nullptr);
// Register a listener.
int count = 0;
if (!bm->setInfo(info, rowBytes)) {
return false;
}
- sk_sp<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, rowBytes, nullptr));
+ sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeAllocate(info, rowBytes, nullptr);
bm->setPixelRef(std::move(pr), 0, 0);
return true;
}
return false;
}
SkPMColor ctStorage[256];
- sk_sp<SkColorTable> ctable(new SkColorTable(ctStorage, 256));
+ auto ctable = SkColorTable::Make(ctStorage, 256);
int count = ctable->count();
- return dst->tryAllocPixels(gen->getInfo(), nullptr, ctable.get()) &&
+ // ICK -- gotta clean up this pattern of writing to the ctable
+ return dst->tryAllocPixels(gen->getInfo(), ctable) &&
gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes(),
const_cast<SkPMColor*>(ctable->readColors()), &count);
}
projects / platform / upstream / libSkiaSharp.git / commitdiff