diff options
| author |  Matt Sarett <msarett@google.com> | 2017-01-23 12:28:02 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 18:26:03 +0000 |
| commit | 62bb2803a8e0ab2571ccec8de72a6a995d46a726 (patch) | |
| tree | 1c614cfc62b8b9e462451ceff7b2f3c015397d6f /src/images/SkPNGImageEncoder.cpp | |
| parent | 03dd6d5208a6e3d92190e7020300e4399178ae4b (diff) | |
Make SkWEBPImageEncoder use transform_scanline_procs
This refactor will make it simple to add F16 and
GammaCorrect support to the webp encoder.
BUG=skia:
Change-Id: I379ba2ff0b44d865847877322e86d0c138e727c8
Reviewed-on: https://skia-review.googlesource.com/7356
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/images/SkPNGImageEncoder.cpp')
| -rw-r--r-- | src/images/SkPNGImageEncoder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/images/SkPNGImageEncoder.cpp b/src/images/SkPNGImageEncoder.cpp index 48aca8bb1e..e4a60f917a 100644 --- a/src/images/SkPNGImageEncoder.cpp +++ b/src/images/SkPNGImageEncoder.cpp @@ -113,7 +113,7 @@ static inline int pack_palette(SkColorTable* ctable, png_color* SK_RESTRICT pale // Unpremultiply the colors. const SkImageInfo rgbaInfo = info.makeColorType(kRGBA_8888_SkColorType); transform_scanline_proc proc = choose_proc(rgbaInfo); - proc((char*) storage, (const char*) colors, ctable->count(), 4); + proc((char*) storage, (const char*) colors, ctable->count(), 4, nullptr); colors = storage; } @@ -350,7 +350,8 @@ static bool do_encode(SkWStream* stream, const SkPixmap& pixmap, transform_scanline_proc proc = choose_proc(pixmap.info()); for (int y = 0; y < pixmap.height(); y++) { png_bytep row_ptr = (png_bytep)storage; - proc(storage, srcImage, pixmap.width(), SkColorTypeBytesPerPixel(pixmap.colorType())); + proc(storage, srcImage, pixmap.width(), SkColorTypeBytesPerPixel(pixmap.colorType()), + nullptr); png_write_rows(png_ptr, &row_ptr, 1); srcImage += pixmap.rowBytes(); } |