Revert of Add SkEncodedInfo to report properties of encoded image data

src/codec/SkRawCodec.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 "SkCodec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 497 matching lines @@
 
             dng_point stage3_size = negative->Stage3Image()->Size();
             render.SetMaximumSize(SkTMax(stage3_size.h, stage3_size.v));
 
             return render.Render();
         } catch (...) {
             return nullptr;
         }
     }
 
-    const SkEncodedInfo& getEncodedInfo() const {
-        return fEncodedInfo;
-    }
-
-    int width() const {
-        return fWidth;
-    }
-
-    int height() const {
-        return fHeight;
+    const SkImageInfo& getImageInfo() const {
+        return fImageInfo;
     }
 
     bool isScalable() const {
         return fIsScalable;
     }
 
     bool isXtransImage() const {
         return fIsXtransImage;
     }
 
 private:
     // Quick check if the image contains a valid TIFF header as requested by DNG format.
     bool isTiffHeaderValid() const {
         const size_t kHeaderSize = 4;
         SkAutoSTMalloc<kHeaderSize, unsigned char> header(kHeaderSize);
         if (!fStream->read(header.get(), 0 /* offset */, kHeaderSize)) {
             return false;
         }
 
         // Check if the header is valid (endian info and magic number "42").
         bool littleEndian;
         if (!is_valid_endian_marker(header, &littleEndian)) {
             return false;
         }
 
         return 0x2A == get_endian_short(header + 2, littleEndian);
     }
 
-    void init(int width, int height, const dng_point& cfaPatternSize) {
-        fWidth = width;
-        fHeight = height;
-        fEncodedInfo = SkEncodedInfo::Make(SkEncodedInfo::kRGB_Color,
-                SkEncodedInfo::kOpaque_Alpha, 8);
+    void init(const int width, const int height, const dng_point& cfaPatternSize) {
+        fImageInfo = SkImageInfo::Make(width, height, kN32_SkColorType, kOpaque_SkAlphaType);
 
         // The DNG SDK scales only during demosaicing, so scaling is only possible when
         // a mosaic info is available.
         fIsScalable = cfaPatternSize.v != 0 && cfaPatternSize.h != 0;
         fIsXtransImage = fIsScalable ? (cfaPatternSize.v == 6 && cfaPatternSize.h == 6) : false;
     }
 
     bool initFromPiex() {
         // Does not take the ownership of rawStream.
         SkPiexStream piexStream(fStream.get());
@@ skipping 49 matching lines @@
     SkDngImage(SkRawStream* stream)
         : fStream(stream) {}
 
     SkDngMemoryAllocator fAllocator;
     SkAutoTDelete<SkRawStream> fStream;
     SkAutoTDelete<dng_host> fHost;
     SkAutoTDelete<dng_info> fInfo;
     SkAutoTDelete<dng_negative> fNegative;
     SkAutoTDelete<dng_stream> fDngStream;
 
-    int fWidth;
-    int fHeight;
-    SkEncodedInfo fEncodedInfo;
+    SkImageInfo fImageInfo;
     bool fIsScalable;
     bool fIsXtransImage;
 };
 
 /*
  * Tries to handle the image with PIEX. If PIEX returns kOk and finds the preview image, create a
  * SkJpegCodec. If PIEX returns kFail, then the file is invalid, return nullptr. In other cases,
  * fallback to create SkRawCodec for DNG images.
  */
 SkCodec* SkRawCodec::NewFromStream(SkStream* stream) {
@@ skipping 127 matching lines @@
     const float shortEdge = static_cast<float>(SkTMin(dim.fWidth, dim.fHeight));
 
     SkISize sizeFloor = this->onGetScaledDimensions(1.f / std::floor(fullShortEdge / shortEdge));
     SkISize sizeCeil = this->onGetScaledDimensions(1.f / std::ceil(fullShortEdge / shortEdge));
     return sizeFloor == dim || sizeCeil == dim;
 }
 
 SkRawCodec::~SkRawCodec() {}
 
 SkRawCodec::SkRawCodec(SkDngImage* dngImage)
-    : INHERITED(dngImage->width(), dngImage->height(), dngImage->getEncodedInfo(), nullptr)
+    : INHERITED(dngImage->getImageInfo(), nullptr)
     , fDngImage(dngImage) {}