| 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 "SkColorTable.h" | 9 #include "SkColorTable.h" |
| 10 #include "SkImageInfo.h" | 10 #include "SkImageInfo.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 protected: | 60 protected: |
| 61 | 61 |
| 62 /* | 62 /* |
| 63 * | 63 * |
| 64 * Initiates the bmp decode | 64 * Initiates the bmp decode |
| 65 * | 65 * |
| 66 */ | 66 */ |
| 67 virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, | 67 virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, |
| 68 size_t dstRowBytes, const Options&, SkPMColor*, | 68 size_t dstRowBytes, const Options&, SkPMColor*, |
| 69 int*) SK_OVERRIDE; | 69 int*) override; |
| 70 | 70 |
| 71 SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE { return kBMP_SkEncod
edFormat; } | 71 SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedF
ormat; } |
| 72 | 72 |
| 73 private: | 73 private: |
| 74 | 74 |
| 75 /* | 75 /* |
| 76 * | 76 * |
| 77 * Used to define the input format of the bmp | 77 * Used to define the input format of the bmp |
| 78 * | 78 * |
| 79 */ | 79 */ |
| 80 enum BitmapInputFormat { | 80 enum BitmapInputFormat { |
| 81 kStandard_BitmapInputFormat, | 81 kStandard_BitmapInputFormat, |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 SkAutoTDelete<SkColorTable> fColorTable; // owned | 175 SkAutoTDelete<SkColorTable> fColorTable; // owned |
| 176 uint32_t fNumColors; | 176 uint32_t fNumColors; |
| 177 const uint32_t fBytesPerColor; | 177 const uint32_t fBytesPerColor; |
| 178 const uint32_t fOffset; | 178 const uint32_t fOffset; |
| 179 const RowOrder fRowOrder; | 179 const RowOrder fRowOrder; |
| 180 const size_t fRLEBytes; | 180 const size_t fRLEBytes; |
| 181 const bool fIsIco; | 181 const bool fIsIco; |
| 182 | 182 |
| 183 typedef SkCodec INHERITED; | 183 typedef SkCodec INHERITED; |
| 184 }; | 184 }; |
| OLD | NEW |