From db6830162eca5b94e61d9825ec93306fc615d204 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 23 Nov 2016 08:55:18 -0700 Subject: SkImageEncoder: simplify API (re-land 248ff02 & 2cb6cb7, with changes) - Hide SkImageEncoder class in private header. - SkImageEncoder::Type becomes SkEncodedImageFormat - SkEncodedFormat becomes SkEncodedImageFormat - SkImageEncoder static functions replaced with single function EncodeImage() - utility wrappers for EncodeImage() are in sk_tool_utils.h TODO: remove link-time registration mechanism. TODO: clean up clients use of API and flip the flag. TODO: implement EncodeImage() in chromeium/skia/ext Change-Id: I47d451e50be4d5c6c130869c7fa7c2857243d9f0 Reviewed-on: https://skia-review.googlesource.com/4909 Reviewed-by: Mike Reed Reviewed-by: Leon Scroggins Reviewed-on: https://skia-review.googlesource.com/5186 Commit-Queue: Hal Canary Reviewed-by: Hal Canary --- tests/PDFDocumentTest.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/PDFDocumentTest.cpp') diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp index fca8496f26..b3200156c6 100644 --- a/tests/PDFDocumentTest.cpp +++ b/tests/PDFDocumentTest.cpp @@ -14,6 +14,8 @@ #include "SkStream.h" #include "SkPixelSerializer.h" +#include "sk_tool_utils.h" + static void test_empty(skiatest::Reporter* reporter) { SkDynamicMemoryWStream stream; @@ -119,14 +121,7 @@ namespace { class JPEGSerializer final : public SkPixelSerializer { bool onUseEncodedData(const void*, size_t) override { return true; } SkData* onEncode(const SkPixmap& pixmap) override { - SkBitmap bm; - return bm.installPixels(pixmap.info(), - pixmap.writable_addr(), - pixmap.rowBytes(), - pixmap.ctable(), - nullptr, nullptr) - ? SkImageEncoder::EncodeData(bm, SkImageEncoder::kJPEG_Type, 85) - : nullptr; + return sk_tool_utils::EncodeImageToData(pixmap, SkEncodedImageFormat::kJPEG, 85).release(); } }; } // namespace -- cgit v1.2.3