From 478884f7d3b8c7be8b62f3fa2b79192f411c3fec Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 16 Sep 2013 13:19:11 +0000 Subject: Revert 11247, 11250, 11251 and 11279 to unblock DEPS roll (https://codereview.chromium.org/24159002/) 11279 Sanitizing source files in Housekeeper-Nightly - https://code.google.com/p/skia/source/detail?r=11279 11251 More warnings as errors fixes - https://code.google.com/p/skia/source/detail?r=11251 11250 Warnings as errors fix - https://code.google.com/p/skia/source/detail?r=11250 11247 Initial error handling code - https://chromiumcodereview.appspot.com/23021015 git-svn-id: http://skia.googlecode.com/svn/trunk@11285 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/lazy/SkLazyPixelRef.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lazy') diff --git a/src/lazy/SkLazyPixelRef.cpp b/src/lazy/SkLazyPixelRef.cpp index 9e023c4a7c..870056091f 100644 --- a/src/lazy/SkLazyPixelRef.cpp +++ b/src/lazy/SkLazyPixelRef.cpp @@ -178,15 +178,15 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) { if (fErrorInDecoding) { return false; } - + SkBitmapFactory::Target target; (void)ComputeMinRowBytesAndSize(info, &target.fRowBytes); - + SkBitmap tmp; if (!init_from_info(&tmp, info, target.fRowBytes)) { return false; } - + target.fAddr = tmp.getPixels(); fErrorInDecoding = !fDecodeProc(fData->data(), fData->size(), &info, &target); if (fErrorInDecoding) { @@ -196,3 +196,5 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) { *bitmap = tmp; return true; } + + -- cgit v1.2.3