From 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 31 Oct 2013 16:31:11 +0000 Subject: Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning" This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497. git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkImageDecoder_CG.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ports') diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp index 9b93f81112..3f850b544d 100644 --- a/src/ports/SkImageDecoder_CG.cpp +++ b/src/ports/SkImageDecoder_CG.cpp @@ -219,7 +219,7 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, // format. // : CGImageDestinationFinalize image destination does not have enough images // So instead we copy to 8888. - if (bm.config() == SkBitmap::kARGB_4444_Config) { + if (bm.getConfig() == SkBitmap::kARGB_4444_Config) { bm.copyTo(&bitmap8888, SkBitmap::kARGB_8888_Config); bmPtr = &bitmap8888; } -- cgit v1.2.3