| 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 "SkEncodedFormat.h" |
| 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, const Options&, SkPMCo
lor*, int*) | 26 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo
lor*, int*) |
| 26 SK_OVERRIDE; | 27 SK_OVERRIDE; |
| 28 SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE { return kPNG_SkEncod
edFormat; } |
| 27 private: | 29 private: |
| 28 png_structp fPng_ptr; | 30 png_structp fPng_ptr; |
| 29 png_infop fInfo_ptr; | 31 png_infop fInfo_ptr; |
| 30 | 32 |
| 31 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); | 33 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); |
| 32 ~SkPngCodec(); | 34 ~SkPngCodec(); |
| 33 | 35 |
| 34 typedef SkCodec INHERITED; | 36 typedef SkCodec INHERITED; |
| 35 }; | 37 }; |
| OLD | NEW |