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

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

Issue 947283002: Bmp Image Decoding (Closed) Base URL: https://skia.googlesource.com/skia.git@decode-leon-3
Patch Set: More code sharing Created 5 years, 9 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
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 "SkCodecPriv.h"
scroggo 2015/03/13 14:06:59 I think this can move to SkCodec_libpng.cpp
msarett 2015/03/13 14:57:07 Done.
9 #include "SkImageInfo.h" 10 #include "SkImageInfo.h"
10 11
11 extern "C" { 12 extern "C" {
12 // FIXME: I'd like to force all platforms to use the same decoder, but this 13 // FIXME: I'd like to force all platforms to use the same decoder, but this
13 // means an extra dependency on Mac/Win. 14 // means an extra dependency on Mac/Win.
14 #include "png.h" 15 #include "png.h"
15 } 16 }
16 17
17 class SkStream; 18 class SkStream;
18 19
19 class SkPngCodec : public SkCodec { 20 class SkPngCodec : public SkCodec {
20 public: 21 public:
21 // Assumes IsPng was called and returned true. 22 // Assumes IsPng was called and returned true.
22 static SkCodec* NewFromStream(SkStream*); 23 static SkCodec* NewFromStream(SkStream*);
23 static bool IsPng(SkStream*); 24 static bool IsPng(SkStream*);
24 protected: 25 protected:
25 Result onGetPixels(const SkImageInfo&, void*, size_t, SkPMColor*, int*) SK_O VERRIDE; 26 Result onGetPixels(const SkImageInfo&, void*, size_t, SkPMColor*, int*) SK_O VERRIDE;
26 private: 27 private:
27 png_structp fPng_ptr; 28 png_structp fPng_ptr;
28 png_infop fInfo_ptr; 29 png_infop fInfo_ptr;
29 30
30 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); 31 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop);
31 ~SkPngCodec(); 32 ~SkPngCodec();
32 33
33 typedef SkCodec INHERITED; 34 typedef SkCodec INHERITED;
34 }; 35 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698