| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkCodec_DEFINED | 8 #ifndef SkCodec_DEFINED |
| 9 #define SkCodec_DEFINED | 9 #define SkCodec_DEFINED |
| 10 | 10 |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 | 768 |
| 769 /** | 769 /** |
| 770 * Used for testing with qcms. | 770 * Used for testing with qcms. |
| 771 * FIXME: Remove this when we are done comparing with qcms. | 771 * FIXME: Remove this when we are done comparing with qcms. |
| 772 */ | 772 */ |
| 773 virtual sk_sp<SkData> getICCData() const { return nullptr; } | 773 virtual sk_sp<SkData> getICCData() const { return nullptr; } |
| 774 | 774 |
| 775 private: | 775 private: |
| 776 const SkEncodedInfo fEncodedInfo; | 776 const SkEncodedInfo fEncodedInfo; |
| 777 const SkImageInfo fSrcInfo; | 777 const SkImageInfo fSrcInfo; |
| 778 SkAutoTDelete<SkStream> fStream; | 778 std::unique_ptr<SkStream> fStream; |
| 779 bool fNeedsRewind; | 779 bool fNeedsRewind; |
| 780 const Origin fOrigin; | 780 const Origin fOrigin; |
| 781 | 781 |
| 782 SkImageInfo fDstInfo; | 782 SkImageInfo fDstInfo; |
| 783 SkCodec::Options fOptions; | 783 SkCodec::Options fOptions; |
| 784 std::unique_ptr<SkColorSpaceXform> fColorXform; | 784 std::unique_ptr<SkColorSpaceXform> fColorXform; |
| 785 | 785 |
| 786 // Only meaningful during scanline decodes. | 786 // Only meaningful during scanline decodes. |
| 787 int fCurrScanline; | 787 int fCurrScanline; |
| 788 | 788 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 // For testing with qcms | 851 // For testing with qcms |
| 852 // FIXME: Remove these when we are done comparing with qcms. | 852 // FIXME: Remove these when we are done comparing with qcms. |
| 853 friend class DM::ColorCodecSrc; | 853 friend class DM::ColorCodecSrc; |
| 854 friend class ColorCodecBench; | 854 friend class ColorCodecBench; |
| 855 | 855 |
| 856 friend class DM::CodecSrc; // for fillIncompleteImage | 856 friend class DM::CodecSrc; // for fillIncompleteImage |
| 857 friend class SkSampledCodec; | 857 friend class SkSampledCodec; |
| 858 friend class SkIcoCodec; | 858 friend class SkIcoCodec; |
| 859 }; | 859 }; |
| 860 #endif // SkCodec_DEFINED | 860 #endif // SkCodec_DEFINED |
| OLD | NEW |