Revert of Add gamma/sRGB tag 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 117 matching lines @@
  *  alphaType for this colorType, return it in canonical.
  */
 bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
                                   SkAlphaType* canonical = NULL);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
  *  Describe an image's dimensions and pixel type.
  */
-struct SK_API SkImageInfo {
-public:
-    SkImageInfo() {}
-
+struct SkImageInfo {
     int         fWidth;
     int         fHeight;
     SkColorType fColorType;
     SkAlphaType fAlphaType;
 
-    /*
-     *  Return an info with the specified attributes, tagged as sRGB. Note that if the requested
-     *  color type does not make sense with sRGB (e.g. kAlpha_8) then the sRGB request is ignored.
-     *
-     *  You can call isSRGB() on the returned info to determine if the request was fulfilled.
-     */
-    static SkImageInfo MakeSRGB(int width, int height, SkColorType ct, SkAlphaType at);
-    
-    /*
-     *  Return an info with the specified attributes, tagged with a specific gamma.
-     *  Note that if the requested gamma is unsupported for the requested color type, then the gamma
-     *  value will be set to 1.0 (the default).
-     *
-     *  You can call gamma() to query the resulting gamma value.
-     */
-    static SkImageInfo MakeWithGamma(int width, int height, SkColorType ct, SkAlphaType at,
-                                     float gamma);
-    
     static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
-        return MakeWithGamma(width, height, ct, at, 1);
+        SkImageInfo info = {
+            width, height, ct, at
+        };
+        return info;
     }
 
     /**
      *  Sets colortype to the native ARGB32 type.
      */
     static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
-        return SkImageInfo(width, height, kN32_SkColorType, at, kExponential_Profile, 1);
+        SkImageInfo info = {
+            width, height, kN32_SkColorType, at
+        };
+        return info;
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
     static SkImageInfo MakeN32Premul(int width, int height) {
-        return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType,
-                           kExponential_Profile, 1);
+        SkImageInfo info = {
+            width, height, kN32_SkColorType, kPremul_SkAlphaType
+        };
+        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) {
-        return SkImageInfo(width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType,
-                           kUnknown_Profile, 0);
+        SkImageInfo info = {
+            width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
+        };
+        return info;
     }
 
     static SkImageInfo MakeUnknown(int width, int height) {
-        return SkImageInfo(width, height, kUnknown_SkColorType, kIgnore_SkAlphaType,
-                           kUnknown_Profile, 0);
+        SkImageInfo info = {
+            width, height, kUnknown_SkColorType, kIgnore_SkAlphaType
+        };
+        return info;
     }
 
     static SkImageInfo MakeUnknown() {
-        return SkImageInfo(0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType, kUnknown_Profile, 0);
+        SkImageInfo info = {
+            0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType
+        };
+        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; }
 
     bool isOpaque() const {
@@ skipping 22 matching lines @@
         return (size_t)this->minRowBytes64();
     }
 
     bool operator==(const SkImageInfo& other) const {
         return 0 == memcmp(this, &other, sizeof(other));
     }
     bool operator!=(const SkImageInfo& other) const {
         return 0 != memcmp(this, &other, sizeof(other));
     }
 
-    // DEPRECATED : use the static Unflatten
     void unflatten(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const;
-    
-    static SkImageInfo Unflatten(SkReadBuffer&);
 
     int64_t getSafeSize64(size_t rowBytes) const {
         if (0 == fHeight) {
             return 0;
         }
         return sk_64_mul(fHeight - 1, rowBytes) + fWidth * this->bytesPerPixel();
     }
 
     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; }
-
-private:
-    enum Profile {
-        kUnknown_Profile,
-        kSRGB_Profile,
-        kExponential_Profile,
-    };
-    
-    uint32_t    fProfile;
-    float       fGamma;
-    
-    SkImageInfo(int width, int height, SkColorType ct, SkAlphaType at, Profile p, float g)
-        : fWidth(width)
-        , fHeight(height)
-        , fColorType(ct)
-        , fAlphaType(at)
-        , fProfile(p)
-        , fGamma(g)
-    {}
 };
 
 #endif