Delete SkARGBImageEncoder.
It appears to be unused now except by its unit test, also deleted. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2208433002 No public API changes. TBR=reed@google.com Review-Url: https://codereview.chromium.org/2208433002
This commit is contained in:
mtklein
Commit bot
parent
757a15fa2e
commit
091cb8d72d
@ -47,7 +47,6 @@
|
||||
|
||||
'../src/images/SkImageEncoder.cpp',
|
||||
'../src/images/SkImageEncoder_Factory.cpp',
|
||||
'../src/images/SkARGBImageEncoder.cpp',
|
||||
'../src/images/SkJPEGWriteUtility.cpp',
|
||||
'../src/images/SkMovie.cpp',
|
||||
'../src/images/SkGIFMovie.cpp',
|
||||
|
||||
@ -100,11 +100,6 @@ protected:
|
||||
|
||||
// All the encoders known by Skia. Note that, depending on the compiler settings,
|
||||
// not all of these will be available
|
||||
/** An ARGBImageEncoder will always write out
|
||||
* bitmap.width() * bitmap.height() * 4
|
||||
* bytes.
|
||||
*/
|
||||
DECLARE_ENCODER_CREATOR(ARGBImageEncoder);
|
||||
DECLARE_ENCODER_CREATOR(JPEGImageEncoder);
|
||||
DECLARE_ENCODER_CREATOR(PNGImageEncoder);
|
||||
DECLARE_ENCODER_CREATOR(KTXImageEncoder);
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
/*
|
||||
* Copyright 2013 Google Inc.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license that can be
|
||||
* found in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "SkImageEncoder.h"
|
||||
#include "SkBitmap.h"
|
||||
#include "SkColorPriv.h"
|
||||
#include "SkStream.h"
|
||||
#include "SkTemplates.h"
|
||||
|
||||
class SkARGBImageEncoder : public SkImageEncoder {
|
||||
protected:
|
||||
bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
|
||||
|
||||
private:
|
||||
typedef SkImageEncoder INHERITED;
|
||||
};
|
||||
|
||||
typedef void (*ScanlineImporter)(const uint8_t* in, uint8_t* argb, int width,
|
||||
const SkPMColor* SK_RESTRICT ctable);
|
||||
|
||||
static void ARGB_8888_To_ARGB(const uint8_t* in, uint8_t* argb, int width, const SkPMColor*) {
|
||||
const uint32_t* SK_RESTRICT src = (const uint32_t*)in;
|
||||
for (int i = 0; i < width; ++i) {
|
||||
const uint32_t c = *src++;
|
||||
argb[0] = SkGetPackedA32(c);
|
||||
argb[1] = SkGetPackedR32(c);
|
||||
argb[2] = SkGetPackedG32(c);
|
||||
argb[3] = SkGetPackedB32(c);
|
||||
argb += 4;
|
||||
}
|
||||
}
|
||||
|
||||
static void RGB_565_To_ARGB(const uint8_t* in, uint8_t* argb, int width, const SkPMColor*) {
|
||||
const uint16_t* SK_RESTRICT src = (const uint16_t*)in;
|
||||
for (int i = 0; i < width; ++i) {
|
||||
const uint16_t c = *src++;
|
||||
argb[0] = 0xFF;
|
||||
argb[1] = SkPacked16ToR32(c);
|
||||
argb[2] = SkPacked16ToG32(c);
|
||||
argb[3] = SkPacked16ToB32(c);
|
||||
argb += 4;
|
||||
}
|
||||
}
|
||||
|
||||
static void ARGB_4444_To_ARGB(const uint8_t* in, uint8_t* argb, int width, const SkPMColor*) {
|
||||
const SkPMColor16* SK_RESTRICT src = (const SkPMColor16*)in;
|
||||
for (int i = 0; i < width; ++i) {
|
||||
const SkPMColor16 c = *src++;
|
||||
argb[0] = SkPacked4444ToA32(c);
|
||||
argb[1] = SkPacked4444ToR32(c);
|
||||
argb[2] = SkPacked4444ToG32(c);
|
||||
argb[3] = SkPacked4444ToB32(c);
|
||||
argb += 4;
|
||||
}
|
||||
}
|
||||
|
||||
static void Index8_To_ARGB(const uint8_t* in, uint8_t* argb, int width,
|
||||
const SkPMColor* SK_RESTRICT ctable) {
|
||||
const uint8_t* SK_RESTRICT src = (const uint8_t*)in;
|
||||
for (int i = 0; i < width; ++i) {
|
||||
const uint32_t c = ctable[*src++];
|
||||
argb[0] = SkGetPackedA32(c);
|
||||
argb[1] = SkGetPackedR32(c);
|
||||
argb[2] = SkGetPackedG32(c);
|
||||
argb[3] = SkGetPackedB32(c);
|
||||
argb += 4;
|
||||
}
|
||||
}
|
||||
|
||||
static ScanlineImporter ChooseImporter(SkColorType ct) {
|
||||
switch (ct) {
|
||||
case kN32_SkColorType:
|
||||
return ARGB_8888_To_ARGB;
|
||||
case kRGB_565_SkColorType:
|
||||
return RGB_565_To_ARGB;
|
||||
case kARGB_4444_SkColorType:
|
||||
return ARGB_4444_To_ARGB;
|
||||
case kIndex_8_SkColorType:
|
||||
return Index8_To_ARGB;
|
||||
default:
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
|
||||
const ScanlineImporter scanline_import = ChooseImporter(bitmap.colorType());
|
||||
if (nullptr == scanline_import) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SkAutoLockPixels alp(bitmap);
|
||||
const uint8_t* src = (uint8_t*)bitmap.getPixels();
|
||||
if (nullptr == bitmap.getPixels()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const SkPMColor* colors = bitmap.getColorTable() ? bitmap.getColorTable()->readColors() : nullptr;
|
||||
|
||||
const int argbStride = bitmap.width() * 4;
|
||||
SkAutoTDeleteArray<uint8_t> ada(new uint8_t[argbStride]);
|
||||
uint8_t* argb = ada.get();
|
||||
for (int y = 0; y < bitmap.height(); ++y) {
|
||||
scanline_import(src + y * bitmap.rowBytes(), argb, bitmap.width(), colors);
|
||||
stream->write(argb, argbStride);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
DEFINE_ENCODER_CREATOR(ARGBImageEncoder);
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -1,62 +0,0 @@
|
||||
/*
|
||||
* Copyright 2012 Google Inc.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license that can be
|
||||
* found in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "SkImageEncoder.h"
|
||||
|
||||
#include "SkBitmap.h"
|
||||
#include "SkCanvas.h"
|
||||
#include "SkStream.h"
|
||||
#include "SkTemplates.h"
|
||||
#include "Test.h"
|
||||
|
||||
static SkColorType gColorTypes[] = {
|
||||
kRGB_565_SkColorType,
|
||||
kN32_SkColorType,
|
||||
};
|
||||
|
||||
DEF_TEST(ARGBImageEncoder, reporter) {
|
||||
// Bytes we expect to get:
|
||||
const int kWidth = 3;
|
||||
const int kHeight = 5;
|
||||
const unsigned char comparisonBuffer[] = {
|
||||
// kHeight rows, each with kWidth pixels, premultiplied ARGB for each pixel
|
||||
0xff,0xff,0x00,0x00, 0xff,0xff,0x00,0x00, 0xff,0xff,0x00,0x00, // red
|
||||
0xff,0x00,0xff,0x00, 0xff,0x00,0xff,0x00, 0xff,0x00,0xff,0x00, // green
|
||||
0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, // blue
|
||||
0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, // blue
|
||||
0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, // blue
|
||||
};
|
||||
|
||||
SkAutoTDelete<SkImageEncoder> enc(CreateARGBImageEncoder());
|
||||
for (size_t ctIndex = 0; ctIndex < SK_ARRAY_COUNT(gColorTypes); ++ctIndex) {
|
||||
// A bitmap that should generate the above bytes:
|
||||
SkBitmap bitmap;
|
||||
{
|
||||
bitmap.allocPixels(SkImageInfo::Make(kWidth, kHeight, gColorTypes[ctIndex],
|
||||
kOpaque_SkAlphaType));
|
||||
bitmap.eraseColor(SK_ColorBLUE);
|
||||
// Change rows [0,1] from blue to [red,green].
|
||||
SkCanvas canvas(bitmap);
|
||||
SkPaint paint;
|
||||
paint.setColor(SK_ColorRED);
|
||||
canvas.drawIRect(SkIRect::MakeLTRB(0, 0, kWidth, 1), paint);
|
||||
paint.setColor(SK_ColorGREEN);
|
||||
canvas.drawIRect(SkIRect::MakeLTRB(0, 1, kWidth, 2), paint);
|
||||
}
|
||||
|
||||
// Transform the bitmap.
|
||||
int bufferSize = bitmap.width() * bitmap.height() * 4;
|
||||
SkAutoTMalloc<char> pixelBufferManager(bufferSize);
|
||||
char* pixelBuffer = pixelBufferManager.get();
|
||||
SkMemoryWStream out(pixelBuffer, bufferSize);
|
||||
REPORTER_ASSERT(reporter, enc->encodeStream(&out, bitmap, SkImageEncoder::kDefaultQuality));
|
||||
|
||||
// Confirm we got the expected results.
|
||||
REPORTER_ASSERT(reporter, bufferSize == sizeof(comparisonBuffer));
|
||||
REPORTER_ASSERT(reporter, memcmp(pixelBuffer, comparisonBuffer, bufferSize) == 0);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user