| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 2001-6 mozilla.org | 4 * Portions are Copyright (C) 2001-6 mozilla.org |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Stuart Parmenter <stuart@mozilla.com> | 7 * Stuart Parmenter <stuart@mozilla.com> |
| 8 * | 8 * |
| 9 * Copyright (C) 2007-2009 Torch Mobile, Inc. | 9 * Copyright (C) 2007-2009 Torch Mobile, Inc. |
| 10 * | 10 * |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 ignoreProfile = true; | 231 ignoreProfile = true; |
| 232 else if (!ImageDecoder::rgbColorProfile(profileData, profileLength)) | 232 else if (!ImageDecoder::rgbColorProfile(profileData, profileLength)) |
| 233 ignoreProfile = true; | 233 ignoreProfile = true; |
| 234 else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength)) | 234 else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength)) |
| 235 ignoreProfile = true; | 235 ignoreProfile = true; |
| 236 | 236 |
| 237 ASSERT(colorProfile.isEmpty()); | 237 ASSERT(colorProfile.isEmpty()); |
| 238 if (!ignoreProfile) | 238 if (!ignoreProfile) |
| 239 colorProfile.append(profileData, profileLength); | 239 colorProfile.append(profileData, profileLength); |
| 240 free(profile); | 240 free(profile); |
| 241 #else | |
| 242 UNUSED_PARAM(info); | |
| 243 UNUSED_PARAM(colorProfile); | |
| 244 #endif | 241 #endif |
| 245 } | 242 } |
| 246 #endif | 243 #endif |
| 247 | 244 |
| 248 class JPEGImageReader { | 245 class JPEGImageReader { |
| 249 WTF_MAKE_FAST_ALLOCATED; | 246 WTF_MAKE_FAST_ALLOCATED; |
| 250 public: | 247 public: |
| 251 JPEGImageReader(JPEGImageDecoder* decoder) | 248 JPEGImageReader(JPEGImageDecoder* decoder) |
| 252 : m_decoder(decoder) | 249 : m_decoder(decoder) |
| 253 , m_bufferLength(0) | 250 , m_bufferLength(0) |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 // has failed. | 792 // has failed. |
| 796 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) | 793 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) |
| 797 setFailed(); | 794 setFailed(); |
| 798 // If we're done decoding the image, we don't need the JPEGImageReader | 795 // If we're done decoding the image, we don't need the JPEGImageReader |
| 799 // anymore. (If we failed, |m_reader| has already been cleared.) | 796 // anymore. (If we failed, |m_reader| has already been cleared.) |
| 800 else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache[0].status() ==
ImageFrame::FrameComplete)) | 797 else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache[0].status() ==
ImageFrame::FrameComplete)) |
| 801 m_reader.clear(); | 798 m_reader.clear(); |
| 802 } | 799 } |
| 803 | 800 |
| 804 } | 801 } |
| OLD | NEW |