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

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

Issue 1032253003: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: addressing comments Created 5 years, 8 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 | « gyp/libpng.gyp ('k') | src/images/SkImageDecoder_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"
11 #include "SkImageInfo.h" 11 #include "SkImageInfo.h"
12 #include "SkRefCnt.h" 12 #include "SkRefCnt.h"
13 #include "SkSwizzler.h" 13 #include "SkSwizzler.h"
14 14
15 extern "C" { 15 #ifdef SKIA_PNG_PREFIXED
16 #include "png.h" 16 // this must proceed png.h
17 } 17 #include "pngprefix.h"
18 #endif
19 #include "png.h"
18 20
19 class SkScanlineDecoder; 21 class SkScanlineDecoder;
20 class SkStream; 22 class SkStream;
21 23
22 class SkPngCodec : public SkCodec { 24 class SkPngCodec : public SkCodec {
23 public: 25 public:
24 // Assumes IsPng was called and returned true. 26 // Assumes IsPng was called and returned true.
25 static SkCodec* NewFromStream(SkStream*); 27 static SkCodec* NewFromStream(SkStream*);
26 static bool IsPng(SkStream*); 28 static bool IsPng(SkStream*);
27 protected: 29 protected:
(...skipping 20 matching lines...) Expand all
48 // Helper to set up swizzler and color table. Also calls png_read_update_inf o. 50 // Helper to set up swizzler and color table. Also calls png_read_update_inf o.
49 Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst, 51 Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst,
50 size_t rowBytes, const Options&); 52 size_t rowBytes, const Options&);
51 bool decodePalette(bool premultiply); 53 bool decodePalette(bool premultiply);
52 void finish(); 54 void finish();
53 55
54 friend class SkPngScanlineDecoder; 56 friend class SkPngScanlineDecoder;
55 57
56 typedef SkCodec INHERITED; 58 typedef SkCodec INHERITED;
57 }; 59 };
OLDNEW
« no previous file with comments | « gyp/libpng.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698