Chromium Code Reviews Chromium Code Reviews
Issue 1487583003:
Allow SkAndroidCodec to use SkPngChunkReader (Closed)
Base URL: https://skia.googlesource.com/skia.git@master| Index: include/codec/SkCodec.h |
| diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h |
| index dffab6b3779207aeba99084810afb27d8416a097..60b83eb5fb90fa747bd7cde460047892ead2dcf1 100644 |
| --- a/include/codec/SkCodec.h |
| +++ b/include/codec/SkCodec.h |
| @@ -29,8 +29,18 @@ public: |
| * If this stream represents an encoded image that we know how to decode, |
| * return an SkCodec that can decode it. Otherwise return NULL. |
| * |
| - * If SkPngChunkReader is not NULL, take a ref and pass it to libpng if |
| - * the image is a png. |
| + * If the SkPngChunkReader is not NULL: |
|
djsollen
2015/11/30 17:52:52
not NULL then:
msarett
2015/11/30 18:05:49
Done.
|
| + * If the image is not a PNG, the SkPngChunkReader will be ignored. |
| + * If the image is a PNG, the SkPngChunkReader will be reffed and |
|
djsollen
2015/11/30 17:52:52
don't say that is is passed to libpng
msarett
2015/11/30 18:05:49
Done.
|
| + * passed to libpng. |
| + * If the PNG has unknown chunks, the SkPngChunkReader will be used |
| + * to handle these chunks. libpng may call the SkPngChunkReader to |
|
djsollen
2015/11/30 17:52:52
SkPngChunkReader will be called to read any unknow
msarett
2015/11/30 18:05:49
Done.
|
| + * read an unknown chunk at any point during the creation of the |
| + * codec or the decode. Note that if SkPngChunkReader fails to |
| + * read a chunk, this could result in a failure to create the codec |
| + * or a failure to decode the image. |
| + * If the PNG does not contain unknown chunks, the SkPngChunkReader |
| + * will not be used or modified. |
| * |
| * If NULL is returned, the stream is deleted immediately. Otherwise, the |
| * SkCodec takes ownership of it, and will delete it when done with it. |
| @@ -41,8 +51,18 @@ public: |
| * If this data represents an encoded image that we know how to decode, |
| * return an SkCodec that can decode it. Otherwise return NULL. |
| * |
| - * If SkPngChunkReader is not NULL, take a ref and pass it to libpng if |
| - * the image is a png. |
| + * If the SkPngChunkReader is not NULL: |
| + * If the image is not a PNG, the SkPngChunkReader will be ignored. |
| + * If the image is a PNG, the SkPngChunkReader will be reffed and |
| + * passed to libpng. |
| + * If the PNG has unknown chunks, the SkPngChunkReader will be used |
| + * to handle these chunks. libpng may call the SkPngChunkReader to |
| + * read an unknown chunk at any point during the creation of the |
| + * codec or the decode. Note that if SkPngChunkReader fails to |
| + * read a chunk, this could result in a failure to create the codec |
| + * or a failure to decode the image. |
| + * If the PNG does not contain unknown chunks, the SkPngChunkReader |
| + * will not be used or modified. |
| * |
| * Will take a ref if it returns a codec, else will not affect the data. |
| */ |
