diff options
| author |  msarett <msarett@google.com> | 2015-06-11 10:13:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-11 10:13:03 -0700 |
| commit | 78d79cc5759d5ec6fb48b28b0cc22d396eb69fb5 (patch) | |
| tree | f2c565bc02af0343ac0adb3548f29cf0153f9dc8 /src/images | |
| parent | 8d0d2b8577bcfe329197286afbd3a01fd5d799c0 (diff) | |
Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders
BUG=skia:1282
Review URL: https://codereview.chromium.org/1103313002
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index c42f214df1..8e92dd874e 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -57,22 +57,6 @@ SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderErrors, ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -static void overwrite_mem_buffer_size(jpeg_decompress_struct* cinfo) { -#ifdef SK_BUILD_FOR_ANDROID - /* Check if the device indicates that it has a large amount of system memory - * if so, increase the memory allocation to 30MB instead of the default 5MB. - */ -#ifdef ANDROID_LARGE_MEMORY_DEVICE - cinfo->mem->max_memory_to_use = 30 * 1024 * 1024; -#else - cinfo->mem->max_memory_to_use = 5 * 1024 * 1024; -#endif -#endif // SK_BUILD_FOR_ANDROID -} - -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - static void do_nothing_emit_message(jpeg_common_struct*, int) { /* do nothing */ } @@ -84,7 +68,6 @@ static void initialize_info(jpeg_decompress_struct* cinfo, skjpeg_source_mgr* sr SkASSERT(cinfo != NULL); SkASSERT(src_mgr != NULL); jpeg_create_decompress(cinfo); - overwrite_mem_buffer_size(cinfo); cinfo->src = src_mgr; /* To suppress warnings with a SK_DEBUG binary, set the * environment variable "skia_images_jpeg_suppressDecoderWarnings" |