Perform color correction on png decodes

src/core/SkOpts.h

Index: src/core/SkOpts.h
diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h
index 87489ee94e0902bcaf694de49a1035324aefbcc4..0d379d189008f24ee5f80fec68a055451e00c316 100644
--- a/src/core/SkOpts.h
+++ b/src/core/SkOpts.h
@@ -66,30 +66,54 @@ namespace SkOpts {
     // If nsrc < ndst, we loop over src to create a pattern.
     extern void (*srcover_srgb_srgb)(uint32_t* dst, const uint32_t* src, int ndst, int nsrc);
 
-    // Color xform RGB1 pixels.
-    extern void (*color_xform_RGB1_to_2dot2) (uint32_t* dst, const uint32_t* src, int len,
+    // Color xform RGBA pixels.
+    extern void (*color_xform_RGBA_to_2dot2) (uint32_t* dst, const uint32_t* src, int len,
                                               const float* const srcTables[3],
                                               const float srcToDstMatrix[16]);
-    extern void (*color_xform_RGB1_to_srgb)(uint32_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_srgb)(uint32_t* dst, const uint32_t* src, int len,
                                             const float* const srcTables[3],
                                             const float srcToDstMatrix[16]);
-    extern void (*color_xform_RGB1_to_table)(uint32_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_table)(uint32_t* dst, const uint32_t* src, int len,
                                              const float* const srcTables[3],
                                              const float srcToDstMatrix[16],
                                              const uint8_t* const dstTables[3]);
-    extern void (*color_xform_RGB1_to_linear)(uint64_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_linear)(uint64_t* dst, const uint32_t* src, int len,
                                               const float* const srcTables[3],
                                               const float srcToDstMatrix[16]);
-    extern void (*color_xform_RGB1_to_2dot2_swaprb) (uint32_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_2dot2_swaprb) (uint32_t* dst, const uint32_t* src, int len,
                                                      const float* const srcTables[3],
                                                      const float srcToDstMatrix[16]);
-    extern void (*color_xform_RGB1_to_srgb_swaprb)(uint32_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_srgb_swaprb)(uint32_t* dst, const uint32_t* src, int len,
                                                    const float* const srcTables[3],
                                                    const float srcToDstMatrix[16]);
-    extern void (*color_xform_RGB1_to_table_swaprb)(uint32_t* dst, const uint32_t* src, int len,
+    extern void (*color_xform_RGBA_to_table_swaprb)(uint32_t* dst, const uint32_t* src, int len,
                                                     const float* const srcTables[3],
                                                     const float srcToDstMatrix[16],
                                                     const uint8_t* const dstTables[3]);
+    extern void (*color_xform_RGBA_to_2dot2_premul) (uint32_t* dst, const uint32_t* src, int len,
+                                                     const float* const srcTables[3],
+                                                     const float srcToDstMatrix[16]);
+    extern void (*color_xform_RGBA_to_srgb_premul)(uint32_t* dst, const uint32_t* src, int len,
+                                                   const float* const srcTables[3],
+                                                   const float srcToDstMatrix[16]);
+    extern void (*color_xform_RGBA_to_table_premul)(uint32_t* dst, const uint32_t* src, int len,
+                                                    const float* const srcTables[3],
+                                                    const float srcToDstMatrix[16],
+                                                    const uint8_t* const dstTables[3]);
+    extern void (*color_xform_RGBA_to_linear_premul)(uint64_t* dst, const uint32_t* src, int len,
+                                                     const float* const srcTables[3],
+                                                     const float srcToDstMatrix[16]);
+    extern void (*color_xform_RGBA_to_2dot2_premul_swaprb) (uint32_t* dst, const uint32_t* src,
+                                                            int len,
+                                                            const float* const srcTables[3],
+                                                            const float srcToDstMatrix[16]);
+    extern void (*color_xform_RGBA_to_srgb_premul_swaprb)(uint32_t* dst, const uint32_t* src,
+                                                          int len, const float* const srcTables[3],
+                                                          const float srcToDstMatrix[16]);
+    extern void (*color_xform_RGBA_to_table_premul_swaprb)(uint32_t* dst, const uint32_t* src,
+                                                           int len, const float* const srcTables[3],
+                                                           const float srcToDstMatrix[16],
+                                                           const uint8_t* const dstTables[3]);
 }
 
 #endif//SkOpts_DEFINED