Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: src/codec/SkCodec_libpng.h

Issue 1242423002: Remove png_read_end from SkPngScanlineDecoder (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove finish() function from SkPngCodec Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/codec/SkCodec_libpng.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.h" 8 #include "SkCodec.h"
9 #include "SkColorTable.h" 9 #include "SkColorTable.h"
10 #include "SkEncodedFormat.h" 10 #include "SkEncodedFormat.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int); 52 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int);
53 53
54 54
55 // Helper to set up swizzler and color table. Also calls png_read_update_inf o. 55 // Helper to set up swizzler and color table. Also calls png_read_update_inf o.
56 Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst, 56 Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst,
57 size_t rowBytes, const Options&, SkPMColor*, int* ctableCount); 57 size_t rowBytes, const Options&, SkPMColor*, int* ctableCount);
58 58
59 // Calls rewindIfNeeded and returns true if the decoder can continue. 59 // Calls rewindIfNeeded and returns true if the decoder can continue.
60 bool handleRewind(); 60 bool handleRewind();
61 bool decodePalette(bool premultiply, int* ctableCount); 61 bool decodePalette(bool premultiply, int* ctableCount);
62 void finish();
63 void destroyReadStruct(); 62 void destroyReadStruct();
64 63
65 friend class SkPngScanlineDecoder; 64 friend class SkPngScanlineDecoder;
66 friend class SkPngInterlacedScanlineDecoder; 65 friend class SkPngInterlacedScanlineDecoder;
67 66
68 typedef SkCodec INHERITED; 67 typedef SkCodec INHERITED;
69 }; 68 };
OLDNEW
« no previous file with comments | « no previous file | src/codec/SkCodec_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698