diff options
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; |