add gamma/sRGB to SkImageInfo

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
@@ skipping 118 matching lines @@
  */
 bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
                                   SkAlphaType* canonical = NULL);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
  *  Describe an image's dimensions and pixel type.
  */
 struct SkImageInfo {
+public:
     int         fWidth;
     int         fHeight;
     SkColorType fColorType;
     SkAlphaType fAlphaType;
 
+//private:
+    enum Profile {
+        kUnknown_Profile,
+        kSRGB_Profile,
+        kExponential_Profile,
+    };
+    
+    uint32_t    fProfile;
+    float       fGamma;
+
+public:
+    static SkImageInfo MakeSRGB(int width, int height, SkColorType ct, SkAlphaType at);
+    
+    static SkImageInfo MakeWithGamam(int width, int height, SkColorType ct, SkAlphaType at,

[bsalomon, 2014/08/27 17:11:30]

typo, gamam

[reed1, 2014/08/27 18:52:49]

Done.

+                                     float gamma);
+    
     static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
         SkImageInfo info = {
-            width, height, ct, at
+            width, height, ct, at, kUnknown_Profile, 0
         };
         return info;
     }
 
     /**
      *  Sets colortype to the native ARGB32 type.
      */
     static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
         SkImageInfo info = {
-            width, height, kN32_SkColorType, at
+            width, height, kN32_SkColorType, at, kUnknown_Profile, 0
         };
         return info;
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
     static SkImageInfo MakeN32Premul(int width, int height) {
         SkImageInfo info = {
-            width, height, kN32_SkColorType, kPremul_SkAlphaType
+            width, height, kN32_SkColorType, kPremul_SkAlphaType, kUnknown_Profile, 0
         };
         return info;
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
     static SkImageInfo MakeN32Premul(const SkISize& size) {
         return MakeN32Premul(size.width(), size.height());
     }
 
     static SkImageInfo MakeA8(int width, int height) {
         SkImageInfo info = {
-            width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
+            width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType, kUnknown_Profile, 0
         };
         return info;
     }
 
     static SkImageInfo MakeUnknown(int width, int height) {
         SkImageInfo info = {
-            width, height, kUnknown_SkColorType, kIgnore_SkAlphaType
+            width, height, kUnknown_SkColorType, kIgnore_SkAlphaType, kUnknown_Profile, 0
         };
         return info;
     }
 
     static SkImageInfo MakeUnknown() {
         SkImageInfo info = {
-            0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType
+            0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType, kUnknown_Profile, 0
         };
         return info;
     }
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     SkColorType colorType() const { return fColorType; }
     SkAlphaType alphaType() const { return fAlphaType; }
 
     bool isEmpty() const { return fWidth <= 0 || fHeight <= 0; }
@@ skipping 44 matching lines @@
     size_t getSafeSize(size_t rowBytes) const {
         return (size_t)this->getSafeSize64(rowBytes);
     }
 
     bool validRowBytes(size_t rowBytes) const {
         uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
         return rowBytes >= rb;
     }
 
     SkDEBUGCODE(void validate() const;)
+
+    /**
+     *  If the Info was tagged to be sRGB, return true, else return false.
+     */
+    bool isSRGB() const { return kSRGB_Profile == fProfile; }
+    
+    /**
+     *  If this was tagged with an explicit gamma value, return that value, else return 0.
+     *  If this was tagged as sRGB, return 0.
+     */
+    float gamma() const { return fGamma; }
 };
 
 #endif