| 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.h" | 8 #include "SkCodec.h" |
| 9 #include "SkImageInfo.h" | 9 #include "SkImageInfo.h" |
| 10 | 10 |
| 11 extern "C" { | 11 extern "C" { |
| 12 // FIXME: I'd like to force all platforms to use the same decoder, but this | 12 // FIXME: I'd like to force all platforms to use the same decoder, but this |
| 13 // means an extra dependency on Mac/Win. | 13 // means an extra dependency on Mac/Win. |
| 14 #include "png.h" | 14 #include "png.h" |
| 15 } | 15 } |
| 16 | 16 |
| 17 class SkStream; | 17 class SkStream; |
| 18 | 18 |
| 19 class SkPngCodec : public SkCodec { | 19 class SkPngCodec : public SkCodec { |
| 20 public: | 20 public: |
| 21 // Assumes IsPng was called and returned true. | 21 // Assumes IsPng was called and returned true. |
| 22 static SkCodec* NewFromStream(SkStream*); | 22 static SkCodec* NewFromStream(SkStream*); |
| 23 static bool IsPng(SkStream*); | 23 static bool IsPng(SkStream*); |
| 24 protected: | 24 protected: |
| 25 Result onGetPixels(const SkImageInfo&, void*, size_t, SkPMColor*, int*) SK_O
VERRIDE; | 25 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo
lor*, int*) |
| 26 SK_OVERRIDE; |
| 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 }; |
| OLD | NEW |