diff options
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 10 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 23 |
2 files changed, 26 insertions, 7 deletions
@@ -946,6 +946,9 @@ static sk_sp<SkColorSpace> rgb_to_gbr() { static Sink* create_via(const SkString& tag, Sink* wrapped) { #define VIA(t, via, ...) if (tag.equals(t)) { return new via(__VA_ARGS__); } VIA("gbr", ViaCSXform, wrapped, rgb_to_gbr(), true); + VIA("p3", ViaCSXform, wrapped, + SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, + SkColorSpace::kDCIP3_D65_Gamut), false); VIA("lite", ViaLite, wrapped); VIA("pipe", ViaPipe, wrapped); #ifdef TEST_VIA_SVG @@ -1182,10 +1185,9 @@ struct Task { const char* ext, SkStream* data, size_t len, const SkBitmap* bitmap) { - bool gammaCorrect = false; - if (bitmap) { - gammaCorrect = SkToBool(bitmap->info().colorSpace()); - } + bool gammaCorrect = bitmap && + bitmap->info().colorSpace() && + bitmap->info().colorSpace()->gammaIsLinear(); JsonWriter::BitmapResult result; result.name = task.src->name(); diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 4f139eb634..d3f7ab61fe 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -18,6 +18,7 @@ #include "Resources.h" #include "SkAndroidCodec.h" #include "SkAutoMalloc.h" +#include "SkAutoPixmapStorage.h" #include "SkBase64.h" #include "SkCodec.h" #include "SkCodecImageGenerator.h" @@ -2192,8 +2193,7 @@ ViaCSXform::ViaCSXform(Sink* sink, sk_sp<SkColorSpace> cs, bool colorSpin) , fColorSpin(colorSpin) {} Error ViaCSXform::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { - return draw_to_canvas(fSink.get(), bitmap, stream, log, src.size(), - [&](SkCanvas* canvas) -> Error { + Error err = draw_to_canvas(fSink.get(), bitmap, stream, log, src.size(), [&](SkCanvas* canvas) { { SkAutoCanvasRestore acr(canvas, true); auto proxy = SkCreateColorSpaceXformCanvas(canvas, fCS); @@ -2219,8 +2219,25 @@ Error ViaCSXform::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkSt canvas->drawBitmap(pixels, 0, 0, &rotateColors); } - return ""; + return Error(""); }); + + if (!err.isEmpty()) { + return err; + } + + if (bitmap && !fColorSpin) { + // It should be possible to do this without all the copies, but that (I think) requires + // adding API to SkBitmap. + SkAutoPixmapStorage pmap; + pmap.alloc(bitmap->info()); + bitmap->readPixels(pmap); + pmap.setColorSpace(fCS); + bitmap->allocPixels(pmap.info()); + bitmap->writePixels(pmap); + } + + return ""; } } // namespace DM |