OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
4 * | 4 * |
5 * Portions are Copyright (C) 2001 mozilla.org | 5 * Portions are Copyright (C) 2001 mozilla.org |
6 * | 6 * |
7 * Other contributors: | 7 * Other contributors: |
8 * Stuart Parmenter <stuart@mozilla.com> | 8 * Stuart Parmenter <stuart@mozilla.com> |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 19 matching lines...) Expand all Loading... |
30 * version of this file only under the terms of one of those two | 30 * version of this file only under the terms of one of those two |
31 * licenses (the MPL or the GPL) and not to allow others to use your | 31 * licenses (the MPL or the GPL) and not to allow others to use your |
32 * version of this file under the LGPL, indicate your decision by | 32 * version of this file under the LGPL, indicate your decision by |
33 * deletingthe provisions above and replace them with the notice and | 33 * deletingthe provisions above and replace them with the notice and |
34 * other provisions required by the MPL or the GPL, as the case may be. | 34 * other provisions required by the MPL or the GPL, as the case may be. |
35 * If you do not delete the provisions above, a recipient may use your | 35 * If you do not delete the provisions above, a recipient may use your |
36 * version of this file under any of the LGPL, the MPL or the GPL. | 36 * version of this file under any of the LGPL, the MPL or the GPL. |
37 */ | 37 */ |
38 | 38 |
39 #include "config.h" | 39 #include "config.h" |
40 #include "core/platform/image-decoders/png/PNGImageDecoder.h" | 40 #include "platform/image-decoders/png/PNGImageDecoder.h" |
41 | 41 |
42 #include "platform/PlatformInstrumentation.h" | 42 #include "platform/PlatformInstrumentation.h" |
43 #include "wtf/PassOwnPtr.h" | 43 #include "wtf/PassOwnPtr.h" |
44 | 44 |
45 #include "png.h" | 45 #include "png.h" |
46 #if USE(QCMSLIB) | 46 #if USE(QCMSLIB) |
47 #include "qcms.h" | 47 #include "qcms.h" |
48 #endif | 48 #endif |
49 | 49 |
50 #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)) | 50 #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)) |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 // has failed. | 527 // has failed. |
528 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) | 528 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) |
529 setFailed(); | 529 setFailed(); |
530 // If we're done decoding the image, we don't need the PNGImageReader | 530 // If we're done decoding the image, we don't need the PNGImageReader |
531 // anymore. (If we failed, |m_reader| has already been cleared.) | 531 // anymore. (If we failed, |m_reader| has already been cleared.) |
532 else if (isComplete()) | 532 else if (isComplete()) |
533 m_reader.clear(); | 533 m_reader.clear(); |
534 } | 534 } |
535 | 535 |
536 } // namespace WebCore | 536 } // namespace WebCore |
OLD | NEW |