From 59b740028752e741e27ce7e7652a59ae56b5450f Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 5 Apr 2012 13:52:35 +0000 Subject: Remove unused android code in JPEG decoder. Review URL: https://codereview.appspot.com/5986047 git-svn-id: http://skia.googlecode.com/svn/trunk@3614 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/images/SkImageDecoder_libjpeg.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index 8bc6f3d9bc..0c2b81654c 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -23,13 +23,6 @@ extern "C" { #include "jerror.h" } -#ifdef SK_BUILD_FOR_ANDROID -#include - -// Key to lookup the size of memory buffer set in system property -static const char KEY_MEM_CAP[] = "ro.media.dec.jpeg.memcap"; -#endif - // this enables timing code to report milliseconds for an encode //#define TIME_ENCODE //#define TIME_DECODE @@ -88,9 +81,13 @@ private: }; #ifdef SK_BUILD_FOR_ANDROID -/* Check if the memory cap property is set. - If so, use the memory size for jpeg decode. -*/ + +/* For non-ndk builds we could look at the system's jpeg memory cap and use it + * if it is set. However, for now we will use the NDK compliant hardcoded values + */ +//#include +//static const char KEY_MEM_CAP[] = "ro.media.dec.jpeg.memcap"; + static void overwrite_mem_buffer_size(j_decompress_ptr cinfo) { #ifdef ANDROID_LARGE_MEMORY_DEVICE cinfo->mem->max_memory_to_use = 30 * 1024 * 1024; -- cgit v1.2.3