aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBitmap.cpp29
-rw-r--r--src/core/SkBlitter_Sprite.cpp11
-rw-r--r--src/core/SkConvertPixels.cpp25
-rw-r--r--src/core/SkImageGenerator.cpp5
-rw-r--r--src/core/SkImageInfo.cpp6
-rw-r--r--src/core/SkImageInfoPriv.h18
-rw-r--r--src/core/SkLinearBitmapPipeline.cpp25
-rw-r--r--src/core/SkLinearBitmapPipeline_sample.h36
-rw-r--r--src/core/SkMallocPixelRef.cpp9
-rw-r--r--src/core/SkPixmap.cpp21
10 files changed, 4 insertions, 181 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 8f8d70f525..e3ce2834f2 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -242,11 +242,6 @@ bool SkBitmap::tryAllocPixels(Allocator* allocator, SkColorTable* ctable) {
///////////////////////////////////////////////////////////////////////////////
bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, size_t rowBytes) {
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (kIndex_8_SkColorType == requestedInfo.colorType()) {
- return reset_return_false(this);
- }
-#endif
if (!this->setInfo(requestedInfo, rowBytes)) {
return reset_return_false(this);
}
@@ -270,11 +265,6 @@ bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, size_t rowBytes)
bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, sk_sp<SkColorTable> ctable,
uint32_t allocFlags) {
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (kIndex_8_SkColorType == requestedInfo.colorType() && nullptr == ctable) {
- return reset_return_false(this);
- }
-#endif
if (!this->setInfo(requestedInfo)) {
return reset_return_false(this);
}
@@ -432,9 +422,6 @@ void* SkBitmap::getAddr(int x, int y) const {
base += x << 1;
break;
case kAlpha_8_SkColorType:
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType:
-#endif
case kGray_8_SkColorType:
base += x;
break;
@@ -455,9 +442,6 @@ void SkBitmap::erase(SkColor c, const SkIRect& area) const {
switch (fInfo.colorType()) {
case kUnknown_SkColorType:
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType:
-#endif
// TODO: can we ASSERT that we never get here?
return; // can't erase. Should we bzero so the memory is not uninitialized?
default:
@@ -658,17 +642,8 @@ static void write_raw_pixels(SkWriteBuffer* buffer, const SkPixmap& pmap) {
src += ramRB;
}
buffer->writeByteArray(storage.get(), size);
-
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- const SkColorTable* ct = pmap.ctable();
- if (kIndex_8_SkColorType == info.colorType() && ct) {
- buffer->writeBool(true);
- ct->writeToBuffer(*buffer);
- } else
-#endif
- {
- buffer->writeBool(false);
- }
+ // no colortable
+ buffer->writeBool(false);
}
void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index ff7d466066..9f34391bc0 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -104,15 +104,6 @@ public:
, fSrcPtr(nullptr)
{}
- static bool Supports(const SkPixmap& src) {
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- // We'd need to add a load_i8 stage.
- return src.colorType() != kIndex_8_SkColorType;
-#else
- return true;
-#endif
- }
-
void setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) override {
fDst = dst;
fLeft = left;
@@ -198,7 +189,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
if (!blitter && !dst.colorSpace() && dst.colorType() == kN32_SkColorType) {
blitter = SkSpriteBlitter::ChooseL32(source, paint, allocator);
}
- if (!blitter && SkRasterPipelineSpriteBlitter::Supports(source)) {
+ if (!blitter) {
blitter = allocator->make<SkRasterPipelineSpriteBlitter>(source, allocator);
}
diff --git a/src/core/SkConvertPixels.cpp b/src/core/SkConvertPixels.cpp
index 2f4c889d1b..f7c6f247bb 100644
--- a/src/core/SkConvertPixels.cpp
+++ b/src/core/SkConvertPixels.cpp
@@ -243,21 +243,6 @@ static void convert_to_alpha8(uint8_t* dst, size_t dstRB, const SkImageInfo& src
}
break;
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType: {
- SkASSERT(ctable);
- const uint32_t* table = ctable->readColors();
- auto src8 = (const uint8_t*)src;
- for (int y = 0; y < srcInfo.height(); y++) {
- for (int x = 0; x < srcInfo.width(); x++) {
- dst[x] = table[src8[x]] >> 24;
- }
- dst = SkTAddOffset<uint8_t>(dst, dstRB);
- src8 = SkTAddOffset<const uint8_t>(src8, srcRB);
- }
- break;
- }
-#endif
case kRGBA_F16_SkColorType: {
auto src64 = (const uint64_t*) src;
for (int y = 0; y < srcInfo.height(); y++) {
@@ -430,16 +415,6 @@ void SkConvertPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
return;
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- // Fast Path 4: Index 8 sources.
- if (kIndex_8_SkColorType == srcInfo.colorType()) {
- SkASSERT(ctable);
- convert_from_index8(dstInfo, dstPixels, dstRB, srcInfo, (const uint8_t*) srcPixels, srcRB,
- ctable, behavior);
- return;
- }
-#endif
-
// Fast Path 5: Alpha 8 dsts.
if (kAlpha_8_SkColorType == dstInfo.colorType()) {
convert_to_alpha8((uint8_t*) dstPixels, dstRB, srcInfo, srcPixels, srcRB, ctable);
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 7ce944be58..a3e825302b 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -19,11 +19,6 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r
if (kUnknown_SkColorType == info.colorType()) {
return false;
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (kIndex_8_SkColorType == info.colorType()) {
- return false;
- }
-#endif
if (nullptr == pixels) {
return false;
}
diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index 90d174db6a..8006441574 100644
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -46,9 +46,6 @@ const Stored_SkColorType gLiveToStored[] = {
kARGB_4444_Stored_SkColorType,
kRGBA_8888_Stored_SkColorType,
kBGRA_8888_Stored_SkColorType,
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- kIndex_8_Stored_SkColorType_DEPRECATED,
-#endif
kGray_8_Stored_SkColorType,
kRGBA_F16_Stored_SkColorType,
};
@@ -135,9 +132,6 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
alphaType = kPremul_SkAlphaType;
}
// fall-through
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType:
-#endif
case kARGB_4444_SkColorType:
case kRGBA_8888_SkColorType:
case kBGRA_8888_SkColorType:
diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index 43680ad605..38de97f8a2 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -111,24 +111,6 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm
return false;
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (kIndex_8_SkColorType == dst.colorType()) {
- if (kIndex_8_SkColorType != src.colorType()) {
- return false;
- }
-
- if ((kPremul_SkAlphaType == dst.alphaType() && kUnpremul_SkAlphaType == src.alphaType()) ||
- (kUnpremul_SkAlphaType == dst.alphaType() && kPremul_SkAlphaType == src.alphaType()))
- {
- return false;
- }
-
- if (dst.colorSpace() && !SkColorSpace::Equals(dst.colorSpace(), src.colorSpace())) {
- return false;
- }
- }
-#endif
-
if (kGray_8_SkColorType == dst.colorType()) {
if (kGray_8_SkColorType != src.colorType()) {
return false;
diff --git a/src/core/SkLinearBitmapPipeline.cpp b/src/core/SkLinearBitmapPipeline.cpp
index 8c4d06281a..07679e3a11 100644
--- a/src/core/SkLinearBitmapPipeline.cpp
+++ b/src/core/SkLinearBitmapPipeline.cpp
@@ -372,11 +372,6 @@ SkLinearBitmapPipeline::SkLinearBitmapPipeline(
// If it is an index 8 color type, the sampler converts to unpremul for better fidelity.
SkAlphaType alphaType = srcImageInfo.alphaType();
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (srcPixmap.colorType() == kIndex_8_SkColorType) {
- alphaType = kUnpremul_SkAlphaType;
- }
-#endif
float postAlpha = SkColorGetA(paintColor) * (1.0f / 255.0f);
// As the stages are built, the chooser function may skip a stage. For example, with the
@@ -598,10 +593,6 @@ SkLinearBitmapPipeline::PixelAccessorInterface* SkLinearBitmapPipeline::choosePi
return this->chooseSpecificAccessor<kRGBA_8888_SkColorType>(srcPixmap, allocator);
case kBGRA_8888_SkColorType:
return this->chooseSpecificAccessor<kBGRA_8888_SkColorType>(srcPixmap, allocator);
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType:
- return this->chooseSpecificAccessor<kIndex_8_SkColorType>(srcPixmap, allocator);
-#endif
case kGray_8_SkColorType:
return this->chooseSpecificAccessor<kGray_8_SkColorType>(srcPixmap, allocator);
case kRGBA_F16_SkColorType: {
@@ -636,14 +627,6 @@ SkLinearBitmapPipeline::SampleProcessorInterface* SkLinearBitmapPipeline::choose
PixelAccessor<kN32_SkColorType, kSRGB_SkGammaType>, Blender>;
return allocator->make<Sampler>(next, srcPixmap);
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType: {
- using Sampler =
- NearestNeighborSampler<
- PixelAccessor<kIndex_8_SkColorType, kSRGB_SkGammaType>, Blender>;
- return allocator->make<Sampler>(next, srcPixmap);
- }
-#endif
default:
break;
}
@@ -655,14 +638,6 @@ SkLinearBitmapPipeline::SampleProcessorInterface* SkLinearBitmapPipeline::choose
PixelAccessor<kN32_SkColorType, kSRGB_SkGammaType>, Blender>;
return allocator->make<Sampler>(next, dimensions, xTile, yTile, srcPixmap);
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType: {
- using Sampler =
- BilerpSampler<
- PixelAccessor<kIndex_8_SkColorType, kSRGB_SkGammaType>, Blender>;
- return allocator->make<Sampler>(next, dimensions, xTile, yTile, srcPixmap);
- }
-#endif
default:
break;
}
diff --git a/src/core/SkLinearBitmapPipeline_sample.h b/src/core/SkLinearBitmapPipeline_sample.h
index 74599786c8..4238931774 100644
--- a/src/core/SkLinearBitmapPipeline_sample.h
+++ b/src/core/SkLinearBitmapPipeline_sample.h
@@ -132,42 +132,6 @@ public:
gammaType == kSRGB_SkGammaType ? Sk4f_fromS32(pixel) : Sk4f_fromL32(pixel));
}
};
-
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
-template <SkGammaType gammaType>
-class PixelConverter<kIndex_8_SkColorType, gammaType> {
-public:
- using Element = uint8_t;
- PixelConverter(const SkPixmap& srcPixmap)
- : fColorTableSize(srcPixmap.ctable()->count()){
- SkColorTable* skColorTable = srcPixmap.ctable();
- SkASSERT(skColorTable != nullptr);
-
- fColorTable = (Sk4f*)SkAlign16((intptr_t)fColorTableStorage.get());
- for (int i = 0; i < fColorTableSize; i++) {
- fColorTable[i] = pmcolor_to_rgba<gammaType>((*skColorTable)[i]);
- }
- }
-
- PixelConverter(const PixelConverter& strategy)
- : fColorTableSize{strategy.fColorTableSize}{
- fColorTable = (Sk4f*)SkAlign16((intptr_t)fColorTableStorage.get());
- for (int i = 0; i < fColorTableSize; i++) {
- fColorTable[i] = strategy.fColorTable[i];
- }
- }
-
- Sk4f toSk4f(Element index) const {
- return fColorTable[index];
- }
-
-private:
- static const size_t kColorTableSize = sizeof(Sk4f[256]) + 12;
- const int fColorTableSize;
- SkAutoMalloc fColorTableStorage{kColorTableSize};
- Sk4f* fColorTable;
-};
-#endif
template <SkGammaType gammaType>
class PixelConverter<kGray_8_SkColorType, gammaType> {
diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp
index ce1c6c1a03..bda14bbda2 100644
--- a/src/core/SkMallocPixelRef.cpp
+++ b/src/core/SkMallocPixelRef.cpp
@@ -144,14 +144,7 @@ sk_sp<SkPixelRef> SkMallocPixelRef::MakeWithData(const SkImageInfo& info,
///////////////////////////////////////////////////////////////////////////////
static sk_sp<SkColorTable> sanitize(const SkImageInfo& info, sk_sp<SkColorTable> ctable) {
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- if (kIndex_8_SkColorType == info.colorType()) {
- SkASSERT(ctable);
- } else
-#endif
- {
- ctable.reset(nullptr);
- }
+ ctable.reset(nullptr);
return ctable;
}
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index cbb40a8fdc..d62fb6200b 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -272,13 +272,6 @@ SkColor SkPixmap::getColor(int x, int y) const {
case kAlpha_8_SkColorType: {
return SkColorSetA(0, *this->addr8(x, y));
}
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType: {
- SkASSERT(this->ctable());
- SkPMColor c = (*this->ctable())[*this->addr8(x, y)];
- return toColor(c);
- }
-#endif
case kRGB_565_SkColorType: {
return SkPixel16ToColor(*this->addr16(x, y));
}
@@ -334,20 +327,6 @@ bool SkPixmap::computeIsOpaque() const {
}
return true;
} break;
-#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
- case kIndex_8_SkColorType: {
- const SkColorTable* ctable = this->ctable();
- if (nullptr == ctable) {
- return false;
- }
- const SkPMColor* table = ctable->readColors();
- SkPMColor c = (SkPMColor)~0;
- for (int i = ctable->count() - 1; i >= 0; --i) {
- c &= table[i];
- }
- return 0xFF == SkGetPackedA32(c);
- } break;
-#endif
case kRGB_565_SkColorType:
case kGray_8_SkColorType:
return true;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 14:29:17 +0000