diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-03 19:29:21 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-03 19:29:21 +0000 |
commit | 608ea6508ae2e9ea05ea863ba50fc27d44d2eae9 (patch) | |
tree | 883b082511c8a08fbfea62c5b9a5fcec1ffecaac /tools | |
parent | f7f5b7c506e5809c178d57232b477849ea614de5 (diff) |
Use SkPicture::ExtractBitmap callback in pdf too, there is no need for a specialized function pointer for pdf only only to pass a rectangle, when we can use subseted bitmaps.
R=scroggo@google.com, reed@google.com, vandebo@chromium.org, bsalomon@google.com
Author: edisonn@google.com
Review URL: https://codereview.chromium.org/25054002
git-svn-id: http://skia.googlecode.com/svn/trunk@11591 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
-rw-r--r-- | tools/PdfRenderer.h | 6 | ||||
-rw-r--r-- | tools/render_pdfs_main.cpp | 46 |
2 files changed, 28 insertions, 24 deletions
diff --git a/tools/PdfRenderer.h b/tools/PdfRenderer.h index d2d1a5c67c..be338e9ea3 100644 --- a/tools/PdfRenderer.h +++ b/tools/PdfRenderer.h @@ -33,7 +33,7 @@ public: virtual void render() = 0; virtual void end(); - PdfRenderer(EncodeToDCTStream encoder) + PdfRenderer(SkPicture::EncodeBitmap encoder) : fPicture(NULL) , fPDFDevice(NULL) , fEncoder(encoder) @@ -48,7 +48,7 @@ protected: SkAutoTUnref<SkCanvas> fCanvas; SkPicture* fPicture; SkPDFDevice* fPDFDevice; - EncodeToDCTStream fEncoder; + SkPicture::EncodeBitmap fEncoder; private: typedef SkRefCnt INHERITED; @@ -56,7 +56,7 @@ private: class SimplePdfRenderer : public PdfRenderer { public: - SimplePdfRenderer(EncodeToDCTStream encoder) + SimplePdfRenderer(SkPicture::EncodeBitmap encoder) : PdfRenderer(encoder) {} virtual void render() SK_OVERRIDE; diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp index f4435021c3..a710064528 100644 --- a/tools/render_pdfs_main.cpp +++ b/tools/render_pdfs_main.cpp @@ -12,6 +12,7 @@ #include "SkImageEncoder.h" #include "SkOSFile.h" #include "SkPicture.h" +#include "SkPixelRef.h" #include "SkStream.h" #include "SkTArray.h" #include "PdfRenderer.h" @@ -81,30 +82,33 @@ static bool replace_filename_extension(SkString* path, } int gJpegQuality = 100; -static bool encode_to_dct_stream(SkWStream* stream, const SkBitmap& bitmap, const SkIRect& rect) { - if (gJpegQuality == -1) return false; - - SkIRect bitmapBounds; - SkBitmap subset; - const SkBitmap* bitmapToUse = &bitmap; - bitmap.getBounds(&bitmapBounds); - if (rect != bitmapBounds) { - SkAssertResult(bitmap.extractSubset(&subset, rect)); - bitmapToUse = ⊂ - } +static SkData* encode_to_dct_data(size_t* pixelRefOffset, const SkBitmap& bitmap) { + if (gJpegQuality == -1) { + return NULL; + } + SkBitmap bm = bitmap; #if defined(SK_BUILD_FOR_MAC) - // Workaround bug #1043 where bitmaps with referenced pixels cause - // CGImageDestinationFinalize to crash - SkBitmap copy; - bitmapToUse->deepCopyTo(©, bitmapToUse->config()); - bitmapToUse = © + // Workaround bug #1043 where bitmaps with referenced pixels cause + // CGImageDestinationFinalize to crash + SkBitmap copy; + bitmap.deepCopyTo(©, bitmap.config()); + bm = copy; #endif - return SkImageEncoder::EncodeStream(stream, - *bitmapToUse, - SkImageEncoder::kJPEG_Type, - gJpegQuality); + SkPixelRef* pr = bm.pixelRef(); + if (pr != NULL) { + SkData* data = pr->refEncodedData(); + if (data != NULL) { + *pixelRefOffset = bm.pixelRefOffset(); + return data; + } + } + + *pixelRefOffset = 0; + return SkImageEncoder::EncodeData(bm, + SkImageEncoder::kJPEG_Type, + gJpegQuality); } /** Builds the output filename. path = dir/name, and it replaces expected @@ -264,7 +268,7 @@ int tool_main_core(int argc, char** argv) { SkTArray<SkString> inputs; SkAutoTUnref<sk_tools::PdfRenderer> - renderer(SkNEW_ARGS(sk_tools::SimplePdfRenderer, (encode_to_dct_stream))); + renderer(SkNEW_ARGS(sk_tools::SimplePdfRenderer, (encode_to_dct_data))); SkASSERT(renderer.get()); SkString outputDir; |