| 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 #include "SkCodec.h" | 8 #include "SkCodec.h" |
| 9 #include "SkImageInfo.h" | 9 #include "SkImageInfo.h" |
| 10 #include "SkMaskSwizzler.h" | 10 #include "SkMaskSwizzler.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 static SkCodec* NewFromStream(SkStream*); | 49 static SkCodec* NewFromStream(SkStream*); |
| 50 | 50 |
| 51 protected: | 51 protected: |
| 52 | 52 |
| 53 /* | 53 /* |
| 54 * | 54 * |
| 55 * Initiates the bitmap decode | 55 * Initiates the bitmap decode |
| 56 * | 56 * |
| 57 */ | 57 */ |
| 58 virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, | 58 virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, |
| 59 size_t dstRowBytes, SkPMColor*, | 59 size_t dstRowBytes, const Options&, SkPMColor*, |
| 60 int*) SK_OVERRIDE; | 60 int*) SK_OVERRIDE; |
| 61 | 61 |
| 62 private: | 62 private: |
| 63 | 63 |
| 64 /* | 64 /* |
| 65 * | 65 * |
| 66 * Used to define the input format of the bitmap | 66 * Used to define the input format of the bitmap |
| 67 * | 67 * |
| 68 */ | 68 */ |
| 69 enum BitmapInputFormat { | 69 enum BitmapInputFormat { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // Fields | 133 // Fields |
| 134 const uint16_t fBitsPerPixel; | 134 const uint16_t fBitsPerPixel; |
| 135 const BitmapInputFormat fInputFormat; | 135 const BitmapInputFormat fInputFormat; |
| 136 SkAutoTDelete<SkMasks> fMasks; // owned | 136 SkAutoTDelete<SkMasks> fMasks; // owned |
| 137 const SkAutoTDeleteArray<SkPMColor> fColorTable; // owned, unpremul | 137 const SkAutoTDeleteArray<SkPMColor> fColorTable; // owned, unpremul |
| 138 const RowOrder fRowOrder; | 138 const RowOrder fRowOrder; |
| 139 const uint32_t fRemainingBytes; | 139 const uint32_t fRemainingBytes; |
| 140 | 140 |
| 141 typedef SkCodec INHERITED; | 141 typedef SkCodec INHERITED; |
| 142 }; | 142 }; |
| OLD | NEW |