| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
| 3 * Copyright (C) 2007-2009 Torch Mobile, Inc. | 3 * Copyright (C) 2007-2009 Torch Mobile, Inc. |
| 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 5 * | 5 * |
| 6 * Portions are Copyright (C) 2001 mozilla.org | 6 * Portions are Copyright (C) 2001 mozilla.org |
| 7 * | 7 * |
| 8 * Other contributors: | 8 * Other contributors: |
| 9 * Stuart Parmenter <stuart@mozilla.com> | 9 * Stuart Parmenter <stuart@mozilla.com> |
| 10 * | 10 * |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 * version of this file under the LGPL, indicate your decision by | 33 * version of this file under the LGPL, indicate your decision by |
| 34 * deletingthe provisions above and replace them with the notice and | 34 * deletingthe provisions above and replace them with the notice and |
| 35 * other provisions required by the MPL or the GPL, as the case may be. | 35 * other provisions required by the MPL or the GPL, as the case may be. |
| 36 * If you do not delete the provisions above, a recipient may use your | 36 * If you do not delete the provisions above, a recipient may use your |
| 37 * version of this file under any of the LGPL, the MPL or the GPL. | 37 * version of this file under any of the LGPL, the MPL or the GPL. |
| 38 */ | 38 */ |
| 39 | 39 |
| 40 #include "config.h" | 40 #include "config.h" |
| 41 #include "core/platform/image-decoders/png/PNGImageDecoder.h" | 41 #include "core/platform/image-decoders/png/PNGImageDecoder.h" |
| 42 | 42 |
| 43 #include "PlatformInstrumentation.h" | 43 #include "core/platform/PlatformInstrumentation.h" |
| 44 #include "png.h" | 44 #include "png.h" |
| 45 #include <wtf/OwnArrayPtr.h> | 45 #include <wtf/OwnArrayPtr.h> |
| 46 #include <wtf/PassOwnPtr.h> | 46 #include <wtf/PassOwnPtr.h> |
| 47 | 47 |
| 48 #if USE(QCMSLIB) | 48 #if USE(QCMSLIB) |
| 49 #include "qcms.h" | 49 #include "qcms.h" |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPN
G_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)) | 52 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPN
G_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)) |
| 53 #define JMPBUF(png_ptr) png_jmpbuf(png_ptr) | 53 #define JMPBUF(png_ptr) png_jmpbuf(png_ptr) |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 // has failed. | 539 // has failed. |
| 540 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) | 540 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) |
| 541 setFailed(); | 541 setFailed(); |
| 542 // If we're done decoding the image, we don't need the PNGImageReader | 542 // If we're done decoding the image, we don't need the PNGImageReader |
| 543 // anymore. (If we failed, |m_reader| has already been cleared.) | 543 // anymore. (If we failed, |m_reader| has already been cleared.) |
| 544 else if (isComplete()) | 544 else if (isComplete()) |
| 545 m_reader.clear(); | 545 m_reader.clear(); |
| 546 } | 546 } |
| 547 | 547 |
| 548 } // namespace WebCore | 548 } // namespace WebCore |
| OLD | NEW |