| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkCodec_libpng.h" | |
| 9 #include "SkCodecPriv.h" | 8 #include "SkCodecPriv.h" |
| 10 #include "SkColorPriv.h" | 9 #include "SkColorPriv.h" |
| 11 #include "SkColorTable.h" | 10 #include "SkColorTable.h" |
| 12 #include "SkBitmap.h" | 11 #include "SkBitmap.h" |
| 13 #include "SkMath.h" | 12 #include "SkMath.h" |
| 13 #include "SkPngCodec.h" |
| 14 #include "SkSize.h" | 14 #include "SkSize.h" |
| 15 #include "SkStream.h" | 15 #include "SkStream.h" |
| 16 #include "SkSwizzler.h" | 16 #include "SkSwizzler.h" |
| 17 #include "SkTemplates.h" | 17 #include "SkTemplates.h" |
| 18 | 18 |
| 19 /////////////////////////////////////////////////////////////////////////////// | 19 /////////////////////////////////////////////////////////////////////////////// |
| 20 // Helper macros | 20 // Helper macros |
| 21 /////////////////////////////////////////////////////////////////////////////// | 21 /////////////////////////////////////////////////////////////////////////////// |
| 22 | 22 |
| 23 #ifndef png_jmpbuf | 23 #ifndef png_jmpbuf |
| (...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 } | 778 } |
| 779 | 779 |
| 780 if (1 == numberPasses) { | 780 if (1 == numberPasses) { |
| 781 return new SkPngScanlineDecoder(imageInfo, streamDeleter.detach(), chunk
Reader, | 781 return new SkPngScanlineDecoder(imageInfo, streamDeleter.detach(), chunk
Reader, |
| 782 png_ptr, info_ptr, bitDepth); | 782 png_ptr, info_ptr, bitDepth); |
| 783 } | 783 } |
| 784 | 784 |
| 785 return new SkPngInterlacedScanlineDecoder(imageInfo, streamDeleter.detach(),
chunkReader, | 785 return new SkPngInterlacedScanlineDecoder(imageInfo, streamDeleter.detach(),
chunkReader, |
| 786 png_ptr, info_ptr, bitDepth, numbe
rPasses); | 786 png_ptr, info_ptr, bitDepth, numbe
rPasses); |
| 787 } | 787 } |
| OLD | NEW |