diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-24 18:53:42 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-24 18:53:42 +0000 |
| commit | 9ebcac54635cde63110d73ad7c43d70772e7872f (patch) | |
| tree | 59ed546835d806d958e25892d79097724efbf983 /src/utils | |
| parent | bde4ba2ce6994a57f1b4e820ac83e9d27caf75de (diff) | |
add installPixels
BUG=skia:
R=halcanary@google.com
Review URL: https://codereview.chromium.org/143073008
git-svn-id: http://skia.googlecode.com/svn/trunk@13174 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkPDFRasterizer.cpp | 3 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 3 | ||||
| -rw-r--r-- | src/utils/mac/SkCreateCGImageRef.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/utils/SkPDFRasterizer.cpp b/src/utils/SkPDFRasterizer.cpp index 68a31196ec..66634804bc 100644 --- a/src/utils/SkPDFRasterizer.cpp +++ b/src/utils/SkPDFRasterizer.cpp @@ -50,8 +50,7 @@ bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output) { char *imgData = image.data(); SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); - if (!bitmap.allocPixels()) { + if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(width, height))) { return false; } bitmap.eraseColor(SK_ColorWHITE); diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index e491f3b8a7..1c3e26e643 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -74,8 +74,7 @@ void SkDebugCanvas::applyUserTransform(SkCanvas* canvas) { int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) { SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); - bitmap.allocPixels(); + bitmap.allocPixels(SkImageInfo::MakeN32Premul(1, 1)); SkCanvas canvas(bitmap); canvas.translate(SkIntToScalar(-x), SkIntToScalar(-y)); diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index 0677b7bc30..1b52ba31a6 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp @@ -209,8 +209,9 @@ bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) { int h = (int)CGRectGetHeight(bounds); SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h); - bitmap.allocPixels(); + if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(w, h))) { + return false; + } bitmap.eraseColor(SK_ColorWHITE); size_t bitsPerComponent; |