commit c367d03fb04fccdc63b1379cf74ddc1cab842039
author Matt Sarett <msarett@google.com> Fri May 05 11:13:26 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 05 16:34:13 2017 +0000
tree 34bf729ad13945d6351874c547edef2064c7415c
parent 243ed375544de7446037fde6ad29944d5eda54bf

Add support for row-by-row png encodes

Also adds a SkEncoder base class.

Bug: 713862
Change-Id: Ia3f009cd9f376514f6c19396245fab3a43ae6536
Reviewed-on: https://skia-review.googlesource.com/15152
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

gm/encode-platform.cpp

diff --git a/gm/encode-platform.cpp b/gm/encode-platform.cpp
index b6e0c1c..fa940b6 100644
--- a/gm/encode-platform.cpp
+++ b/gm/encode-platform.cpp
@@ -13,6 +13,7 @@
 #include "SkImage.h"
 #include "SkImageEncoderPriv.h"
 #include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
 #include "SkUnPreMultiply.h"
 
 namespace skiagm {
@@ -69,9 +70,12 @@
         return SkEncodeImageWithWIC(&buf, src, type, 100) ? buf.detachAsData() : nullptr;
     #else
         switch (type) {
-            case SkEncodedImageFormat::kPNG:
-                return SkEncodeImageAsPNG(&buf, src, SkEncodeOptions()) ? buf.detachAsData()
-                                                                        : nullptr;
+            case SkEncodedImageFormat::kPNG: {
+                SkPngEncoder::Options options;
+                options.fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
+                bool success = SkPngEncoder::Encode(&buf, src, options);
+                return success ? buf.detachAsData() : nullptr;
+            }
             case SkEncodedImageFormat::kJPEG: {
                 bool success = SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options());
                 return success ? buf.detachAsData() : nullptr;

gm/encode-srgb.cpp

diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp
index bbaeaa7..bf9ef82 100644
--- a/gm/encode-srgb.cpp
+++ b/gm/encode-srgb.cpp
@@ -15,6 +15,7 @@
 #include "SkImage.h"
 #include "SkImageEncoderPriv.h"
 #include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
 #include "SkPM4f.h"
 #include "SkSRGB.h"
 
@@ -117,14 +118,16 @@
     }
     SkDynamicMemoryWStream buf;
 
+    SkPngEncoder::Options pngOptions;
     SkEncodeOptions options;
     if (bitmap.colorSpace()) {
+        pngOptions.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
         options.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
     }
 
     switch (format) {
         case SkEncodedImageFormat::kPNG:
-            SkAssertResult(SkEncodeImageAsPNG(&buf, src, options));
+            SkAssertResult(SkPngEncoder::Encode(&buf, src, pngOptions));
             break;
         case SkEncodedImageFormat::kWEBP:
             SkAssertResult(SkEncodeImageAsWEBP(&buf, src, options));