aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debugger/QT/SkDebuggerGUI.cpp5
-rw-r--r--include/core/SkImageEncoder.h8
-rw-r--r--src/image/SkImage.cpp33
-rw-r--r--src/images/SkImageEncoder.cpp30
-rw-r--r--src/ports/SkImageDecoder_empty.cpp18
-rw-r--r--tests/PictureTest.cpp5
-rw-r--r--tools/sk_tool_utils.cpp13
-rw-r--r--tools/sk_tool_utils.h8
8 files changed, 68 insertions, 52 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 4422334496..0d009b3ffa 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -281,8 +281,9 @@ void SkDebuggerGUI::saveToFile(const SkString& filename) {
SkFILEWStream file(filename.c_str());
SkAutoTUnref<SkPicture> copy(fDebugger.copyPicture());
- sk_tool_utils::PngPixelSerializer serializer;
- copy->serialize(&file, &serializer);
+ SkAutoTUnref<SkPixelSerializer> serializer(
+ SkImageEncoder::CreatePixelSerializer());
+ copy->serialize(&file, serializer);
}
void SkDebuggerGUI::loadFile(QListWidgetItem *item) {
diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index fc999dcc18..bb3341f836 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -12,6 +12,8 @@
#include "SkTRegistry.h"
class SkBitmap;
+class SkPixelSerializer;
+class SkPixmap;
class SkData;
class SkWStream;
@@ -64,11 +66,17 @@ public:
Type, int quality);
static SkData* EncodeData(const SkBitmap&, Type, int quality);
+ static SkData* EncodeData(const SkPixmap&, Type, int quality);
+
static bool EncodeFile(const char file[], const SkBitmap&, Type,
int quality);
static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
int quality);
+ /** Uses SkImageEncoder to serialize images that are not already
+ encoded as SkImageEncoder::kPNG_Type images. */
+ static SkPixelSerializer* CreatePixelSerializer();
+
protected:
/**
* Encode bitmap 'bm' in the desired format, writing results to
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 7db5b4e0a8..338ab09130 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -9,6 +9,7 @@
#include "SkBitmapCache.h"
#include "SkCanvas.h"
#include "SkData.h"
+#include "SkImageEncoder.h"
#include "SkImageGenerator.h"
#include "SkImagePriv.h"
#include "SkImageShader.h"
@@ -178,32 +179,14 @@ SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
return nullptr;
}
-namespace {
-
-class DefaultSerializer : public SkPixelSerializer {
-protected:
- bool onUseEncodedData(const void *data, size_t len) override {
- return true;
- }
- SkData* onEncode(const SkPixmap& pixmap) override {
- SkBitmap bm;
- if (!bm.installPixels(pixmap.info(),
- const_cast<void*>(pixmap.addr()),
- pixmap.rowBytes(),
- pixmap.ctable(),
- nullptr, nullptr)) {
- return nullptr;
- }
- return SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, 100);
- }
-};
-
-} // anonymous namespace
-
SkData* SkImage::encode(SkPixelSerializer* serializer) const {
- DefaultSerializer defaultSerializer;
- SkPixelSerializer* effectiveSerializer = serializer ? serializer : &defaultSerializer;
-
+ SkAutoTUnref<SkPixelSerializer> defaultSerializer;
+ SkPixelSerializer* effectiveSerializer = serializer;
+ if (!effectiveSerializer) {
+ defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer());
+ SkASSERT(defaultSerializer.get());
+ effectiveSerializer = defaultSerializer.get();
+ }
SkAutoTUnref<SkData> encoded(this->refEncoded());
if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded->size())) {
return encoded.detach();
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index cc1b73baa5..22bbc57c2f 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -7,6 +7,8 @@
#include "SkImageEncoder.h"
#include "SkBitmap.h"
+#include "SkPixelSerializer.h"
+#include "SkPixmap.h"
#include "SkStream.h"
#include "SkTemplates.h"
@@ -57,6 +59,30 @@ SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels,
if (!bm.installPixels(info, const_cast<void*>(pixels), rowBytes)) {
return nullptr;
}
- SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
- return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr;
+ bm.setImmutable();
+ return SkImageEncoder::EncodeData(bm, t, quality);
+}
+
+SkData* SkImageEncoder::EncodeData(const SkPixmap& pixmap,
+ Type t, int quality) {
+ SkBitmap bm;
+ if (!bm.installPixels(pixmap)) {
+ return nullptr;
+ }
+ bm.setImmutable();
+ return SkImageEncoder::EncodeData(bm, t, quality);
+}
+
+namespace {
+class ImageEncoderPixelSerializer final : public SkPixelSerializer {
+protected:
+ bool onUseEncodedData(const void*, size_t) override { return true; }
+ SkData* onEncode(const SkPixmap& pmap) override {
+ return SkImageEncoder::EncodeData(pmap, SkImageEncoder::kPNG_Type, 100);
+ }
+};
+} // namespace
+
+SkPixelSerializer* SkImageEncoder::CreatePixelSerializer() {
+ return new ImageEncoderPixelSerializer;
}
diff --git a/src/ports/SkImageDecoder_empty.cpp b/src/ports/SkImageDecoder_empty.cpp
index 11c3db1afc..f52dada73b 100644
--- a/src/ports/SkImageDecoder_empty.cpp
+++ b/src/ports/SkImageDecoder_empty.cpp
@@ -11,6 +11,7 @@
#include "SkImageDecoder.h"
#include "SkImageEncoder.h"
#include "SkMovie.h"
+#include "SkPixelSerializer.h"
#include "SkStream.h"
class SkColorTable;
@@ -108,6 +109,10 @@ SkData* SkImageEncoder::EncodeData(const SkImageInfo&, const void* pixels, size_
return nullptr;
}
+SkData* SkImageEncoder::EncodeData(const SkPixmap&, Type, int) {
+ return nullptr;
+}
+
bool SkImageEncoder::encodeStream(SkWStream*, const SkBitmap&, int) {
return false;
}
@@ -119,4 +124,17 @@ SkData* SkImageEncoder::encodeData(const SkBitmap&, int) {
bool SkImageEncoder::encodeFile(const char file[], const SkBitmap& bm, int quality) {
return false;
}
+
+namespace {
+class ImageEncoderPixelSerializer final : public SkPixelSerializer {
+protected:
+ bool onUseEncodedData(const void*, size_t) override { return true; }
+ SkData* onEncode(const SkPixmap&) override { return nullptr; }
+};
+} // namespace
+
+SkPixelSerializer* SkImageEncoder::CreatePixelSerializer() {
+ return new ImageEncoderPixelSerializer;
+}
+
/////////////////////////////////////////////////////////////////////////
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 1575456491..a81733e38a 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -851,8 +851,9 @@ static SkData* serialized_picture_from_bitmap(const SkBitmap& bitmap) {
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
SkDynamicMemoryWStream wStream;
- sk_tool_utils::PngPixelSerializer serializer;
- picture->serialize(&wStream, &serializer);
+ SkAutoTUnref<SkPixelSerializer> serializer(
+ SkImageEncoder::CreatePixelSerializer());
+ picture->serialize(&wStream, serializer);
return wStream.copyToData();
}
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index 8c3097602c..e2bc0fc42c 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -222,19 +222,6 @@ SkBitmap create_string_bitmap(int w, int h, SkColor c, int x, int y,
return bitmap;
}
-bool PngPixelSerializer::onUseEncodedData(const void*, size_t) { return true; }
-SkData* PngPixelSerializer::onEncode(const SkPixmap& pixmap) {
- SkBitmap bm;
- if (!bm.installPixels(pixmap.info(),
- const_cast<void*>(pixmap.addr()),
- pixmap.rowBytes(),
- pixmap.ctable(),
- nullptr, nullptr)) {
- return nullptr;
- }
- return SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, 100);
-}
-
void add_to_text_blob(SkTextBlobBuilder* builder, const char* text, const SkPaint& origPaint,
SkScalar x, SkScalar y) {
SkPaint paint(origPaint);
diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index 3eabcdcd0f..dab42e31fd 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -114,14 +114,6 @@ namespace sk_tool_utils {
SkBitmap create_string_bitmap(int w, int h, SkColor c, int x, int y,
int textSize, const char* str);
- // Encodes to PNG, unless there is already encoded data, in which case that gets
- // used.
- class PngPixelSerializer : public SkPixelSerializer {
- public:
- bool onUseEncodedData(const void*, size_t) override;
- SkData* onEncode(const SkPixmap&) override;
- };
-
// A helper for inserting a drawtext call into a SkTextBlobBuilder
void add_to_text_blob(SkTextBlobBuilder* builder, const char* text, const SkPaint& origPaint,
SkScalar x, SkScalar y);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 11:12:02 +0000