From 5a7c6be72b940dde8ff6ad2485a09aecd56a2660 Mon Sep 17 00:00:00 2001 From: "scroggo@google.com" Date: Thu, 4 Oct 2012 21:46:08 +0000 Subject: Add the ability to provide function pointers to SkPicture serialization and deserialization for encoding and decoding bitmaps. Remove kForceFlattenBitmapPixels_Flag, which is no longer used. When an SkOrderedReadBuffer needs to read a bitmap, if it does not have an image decoder, use a dummy bitmap. In GM, add a tolerance option for color differences, used when testing picture serialization, so it can assume two images are the same even though PNG encoding/decoding may have resulted in small differences. Create dummy implementations for SkImageDecoder and SkImageEncoder functions in SkImageDecoder_empty so that a project that does not want to include the images project it can still build. Allow ports to build without images project. In Mac's image encoder, copy 4444 to 8888 before encoding. Add SkWriter32::reservePad, to provide a pointer to write non 4 byte aligned data, padded with zeroes. In bench_ and render_ pictures, pass decode function to SkPicture creation from a stream. BUG=https://code.google.com/p/skia/issues/detail?id=842 Review URL: https://codereview.appspot.com/6551071 git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools/render_pictures_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/render_pictures_main.cpp') diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp index 477272df25..6d6e8db19a 100644 --- a/tools/render_pictures_main.cpp +++ b/tools/render_pictures_main.cpp @@ -9,6 +9,7 @@ #include "SkCanvas.h" #include "SkDevice.h" #include "SkGraphics.h" +#include "SkImageDecoder.h" #include "SkMath.h" #include "SkOSFile.h" #include "SkPicture.h" @@ -96,7 +97,7 @@ static bool render_picture(const SkString& inputPath, const SkString& outputDir, } bool success = false; - SkPicture picture(&inputStream, &success); + SkPicture picture(&inputStream, &success, &SkImageDecoder::DecodeStream); if (!success) { SkDebugf("Could not read an SkPicture from %s\n", inputPath.c_str()); return false; -- cgit v1.2.3