From 59a1df225d1229f7aedd58cab4337892e390574e Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Fri, 19 Jan 2018 11:32:06 -0500 Subject: Delete SkColorSpaceXformImageGenerator and SkImagePriv::SkMakeImageInColorSpace These don't seem to be used by anyone anymore so lets kill them. Bug: skia: Change-Id: I7908a9c9357e9e3b3166af9a14899dab522c3f11 Reviewed-on: https://skia-review.googlesource.com/97144 Reviewed-by: Robert Phillips Reviewed-by: Brian Osman Commit-Queue: Greg Daniel --- tests/ImageGeneratorTest.cpp | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'tests/ImageGeneratorTest.cpp') diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 5cfd410ad0..7ee0b90c4c 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -110,46 +110,3 @@ DEF_TEST(PictureImageGenerator, reporter) { } } -#include "SkImagePriv.h" - -DEF_TEST(ColorXformGenerator, r) { - SkBitmap a, b, c, d, e; - SkImageInfo info = SkImageInfo::MakeS32(1, 1, kPremul_SkAlphaType); - a.allocPixels(info); - b.allocPixels(info.makeColorSpace(nullptr)); - c.allocPixels(info.makeColorSpace(SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, - SkColorSpace::kRec2020_Gamut))); - d.allocPixels(info.makeColorSpace(SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, - SkColorSpace::kAdobeRGB_Gamut))); - e.allocPixels(info); - a.eraseColor(0); - b.eraseColor(1); - c.eraseColor(2); - d.eraseColor(3); - e.eraseColor(4); - - sk_sp srgb = SkColorSpace::MakeSRGB(); - sk_sp ia = SkMakeImageInColorSpace(a, srgb, 0); - sk_sp ib = SkMakeImageInColorSpace(b, srgb, b.getGenerationID()); - sk_sp ic = SkMakeImageInColorSpace(c, srgb, c.getGenerationID()); - sk_sp id = SkMakeImageInColorSpace(d, srgb, 0); - sk_sp ie = SkMakeImageInColorSpace(e, srgb, e.getGenerationID(), - kAlways_SkCopyPixelsMode); - - // Equal because sRGB->sRGB is a no-op. - REPORTER_ASSERT(r, ia->uniqueID() == a.getGenerationID()); - - // Equal because nullptr->sRGB is a no-op (nullptr is treated as sRGB), and because - // we pass the explicit id that we want. In the no-op case, the implementation - // actually asserts that if we pass an id, it must match the id on the bitmap. - REPORTER_ASSERT(r, ib->uniqueID() == b.getGenerationID()); - - // Equal because we pass in an explicit id. - REPORTER_ASSERT(r, ic->uniqueID() == c.getGenerationID()); - - // Not equal because sRGB->Adobe is not a no-op and we do not pass an explicit id. - REPORTER_ASSERT(r, id->uniqueID() != d.getGenerationID()); - - // Equal because we pass in an explicit id. Forcing a copy, but still want the id respected. - REPORTER_ASSERT(r, ie->uniqueID() == e.getGenerationID()); -} -- cgit v1.2.3