remove auto-upscaling from base class (breaks model for allocators) but improve

the upscaling inside the png codec.



git-svn-id: http://skia.googlecode.com/svn/trunk@294 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 1 insertions, 11 deletions

diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 4f9fa9bb1b..4711f89d7f 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -90,6 +90,7 @@ bool SkImageDecoder::allocPixelRef(SkBitmap* bitmap,
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+
 bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm,
                             SkBitmap::Config pref, Mode mode) {
     // pass a temporary bitmap, so that if we return false, we are assured of
@@ -102,17 +103,6 @@ bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm,
     if (!this->onDecode(stream, &tmp, pref, mode)) {
         return false;
     }
-
-    if (tmp.config() != pref && tmp.canCopyTo(pref)) {
-        if (mode == kDecodeBounds_Mode) {
-            tmp.setConfig(pref, tmp.width(), tmp.height());
-        } else if (mode == kDecodePixels_Mode) {
-            SkBitmap tmp2;
-            if (tmp.copyTo(&tmp2, pref, this->getAllocator())) {
-                tmp.swap(tmp2);
-            }
-        }
-    }
     bm->swap(tmp);
     return true;
 }