diff options
| author |  msarett <msarett@google.com> | 2016-07-28 17:11:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-28 17:11:18 -0700 |
| commit | 39979d8c6b97889f600a212cfc9b063360f3de2f (patch) | |
| tree | 3a63566b6e7643335fda8c60451b922c73bac92e /tests | |
| parent | ecf3dbe8f2987a08b21be1aff61b7fbfbb69640a (diff) | |
Revert of Add color space xform support to SkJpegCodec (includes F16!) (patchset #9 id:260001 of https://codereview.chromium.org/2174493002/ )
Reason for revert:
Breaking MSAN
Original issue's description:
> Add color space xform support to SkJpegCodec (includes F16!)
>
> Also changes SkColorXform to support:
> RGBA->RGBA
> RGBA->BGRA
>
> Instead of:
> RGBA->SkPMColor
>
> TBR=reed@google.com
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2174493002
> CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/73d55332e2846dd05e9efdaa2f017bcc3872884b
TBR=mtklein@google.com,reed@google.com,herb@google.com,brianosman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2195523002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ColorSpaceXformTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp index 1e75ee6853..23b08ce8ae 100644 --- a/tests/ColorSpaceXformTest.cpp +++ b/tests/ColorSpaceXformTest.cpp @@ -37,19 +37,19 @@ static void test_identity_xform(skiatest::Reporter* r, const sk_sp<SkGammas>& ga // Create and perform an identity xform. std::unique_ptr<SkColorSpaceXform> xform = ColorSpaceXformTest::CreateIdentityXform(gammas); - xform->applyToRGBA(dstPixels, srcPixels, width); + xform->applyTo8888(dstPixels, srcPixels, width); // Since the src->dst matrix is the identity, and the gamma curves match, // the pixels should be unchanged. for (int i = 0; i < width; i++) { REPORTER_ASSERT(r, almost_equal(((srcPixels[i] >> 0) & 0xFF), - ((dstPixels[i] >> 0) & 0xFF))); + SkGetPackedR32(dstPixels[i]))); REPORTER_ASSERT(r, almost_equal(((srcPixels[i] >> 8) & 0xFF), - ((dstPixels[i] >> 8) & 0xFF))); + SkGetPackedG32(dstPixels[i]))); REPORTER_ASSERT(r, almost_equal(((srcPixels[i] >> 16) & 0xFF), - ((dstPixels[i] >> 16) & 0xFF))); + SkGetPackedB32(dstPixels[i]))); REPORTER_ASSERT(r, almost_equal(((srcPixels[i] >> 24) & 0xFF), - ((dstPixels[i] >> 24) & 0xFF))); + SkGetPackedA32(dstPixels[i]))); } } |