Fix generic color space xform, ColorSpaceXformTest

tests/ColorSpaceXformTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkCodec.h"
 #include "SkColorPriv.h"
 #include "SkColorSpace.h"
 #include "SkColorSpace_Base.h"
 #include "SkColorSpaceXform.h"
 #include "Test.h"
 
 class ColorSpaceXformTest {
 public:
     static std::unique_ptr<SkColorSpaceXform> CreateIdentityXform(const sk_sp<SkGammas>& gammas) {
         // Logically we can pass any matrix here.  For simplicty, pass I(), i.e. D50 XYZ gamut.
         sk_sp<SkColorSpace> space(new SkColorSpace_Base(
                 nullptr, SkColorSpace::kNonStandard_GammaNamed, gammas, SkMatrix::I(), nullptr));
-        return SkColorSpaceXform::New(space, space);

[msarett, 2016/08/23 14:03:12]

This test became useless when we added opts for space == space.

+
+        // Use constructor with kNone_ColorSpaceMatch to create SkColorSpaceXform.  This way,
+        // we bypass the optimizations for when src == dst and actually do the color xform.
+        return std::unique_ptr<SkColorSpaceXform>(new SkColorSpaceXform_Base
+                <SkColorSpace::kNonStandard_GammaNamed, kNone_ColorSpaceMatch>
+                (space, SkMatrix::I(), space));
     }
 };
 
 static bool almost_equal(int x, int y) {
     return SkTAbs(x - y) <= 1;
 }
 
 static void test_identity_xform(skiatest::Reporter* r, const sk_sp<SkGammas>& gammas) {
     // Arbitrary set of 10 pixels
     constexpr int width = 10;
     constexpr uint32_t srcPixels[width] = {
             0xFFABCDEF, 0xFF146829, 0xFF382759, 0xFF184968, 0xFFDE8271,
             0xFF32AB52, 0xFF0383BC, 0xFF000102, 0xFFFFFFFF, 0xFFDDEEFF, };
     uint32_t dstPixels[width];
 
     // Create and perform an identity xform.
     std::unique_ptr<SkColorSpaceXform> xform = ColorSpaceXformTest::CreateIdentityXform(gammas);
-    xform->apply(dstPixels, srcPixels, width, kRGBA_8888_SkColorType, kOpaque_SkAlphaType);
+    xform->apply(dstPixels, srcPixels, width, kN32_SkColorType, kOpaque_SkAlphaType);

[msarett, 2016/08/23 14:03:12]

Turns out only testing RGBA->RGBA is a bad idea...

 
     // 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])));
     }
 }
 
 DEF_TEST(ColorSpaceXform_TableGamma, r) {
     // Lookup-table based gamma curves
     constexpr size_t tableSize = 10;
     void* memory = sk_malloc_throw(sizeof(SkGammas) + sizeof(float) * tableSize);
     sk_sp<SkGammas> gammas = sk_sp<SkGammas>(new (memory) SkGammas());
     gammas->fRedType = gammas->fGreenType = gammas->fBlueType = SkGammas::Type::kTable_Type;
     gammas->fRedData.fTable.fSize = gammas->fGreenData.fTable.fSize =
@@ skipping 81 matching lines @@
 
     gammas->fGreenType = SkGammas::Type::kTable_Type;
     gammas->fGreenData.fTable.fSize = tableSize;
     gammas->fGreenData.fTable.fOffset = 0;
 
     gammas->fBlueType = SkGammas::Type::kParam_Type;
     gammas->fBlueData.fParamOffset = sizeof(float) * tableSize;
 
     test_identity_xform(r, gammas);
 }