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 "SkScanlineDecoder.h" | 8 #include "SkScanlineDecoder.h" |
| 9 #include "SkBmpCodec.h" |
9 #include "SkCodec_libpng.h" | 10 #include "SkCodec_libpng.h" |
10 #include "SkCodec_wbmp.h" | 11 #include "SkCodec_wbmp.h" |
11 #include "SkCodecPriv.h" | 12 #include "SkCodecPriv.h" |
12 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK | 13 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK |
13 #include "SkJpegCodec.h" | 14 #include "SkJpegCodec.h" |
14 #endif | 15 #endif |
15 | 16 |
16 struct DecoderProc { | 17 struct DecoderProc { |
17 bool (*IsFormat)(SkStream*); | 18 bool (*IsFormat)(SkStream*); |
18 SkScanlineDecoder* (*NewFromStream)(SkStream*); | 19 SkScanlineDecoder* (*NewFromStream)(SkStream*); |
19 }; | 20 }; |
20 | 21 |
21 static const DecoderProc gDecoderProcs[] = { | 22 static const DecoderProc gDecoderProcs[] = { |
22 { SkPngCodec::IsPng, SkPngCodec::NewSDFromStream }, | 23 { SkPngCodec::IsPng, SkPngCodec::NewSDFromStream }, |
23 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK | 24 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK |
24 { SkJpegCodec::IsJpeg, SkJpegCodec::NewSDFromStream }, | 25 { SkJpegCodec::IsJpeg, SkJpegCodec::NewSDFromStream }, |
25 #endif | 26 #endif |
| 27 { SkBmpCodec::IsBmp, SkBmpCodec::NewSDFromStream }, |
26 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewSDFromStream }, | 28 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewSDFromStream }, |
27 }; | 29 }; |
28 | 30 |
29 SkScanlineDecoder* SkScanlineDecoder::NewFromStream(SkStream* stream) { | 31 SkScanlineDecoder* SkScanlineDecoder::NewFromStream(SkStream* stream) { |
30 if (!stream) { | 32 if (!stream) { |
31 return NULL; | 33 return NULL; |
32 } | 34 } |
33 | 35 |
34 SkAutoTDelete<SkStream> streamDeleter(stream); | 36 SkAutoTDelete<SkStream> streamDeleter(stream); |
35 | 37 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 | 96 |
95 fCurrScanline = 0; | 97 fCurrScanline = 0; |
96 fDstInfo = dstInfo; | 98 fDstInfo = dstInfo; |
97 return SkCodec::kSuccess; | 99 return SkCodec::kSuccess; |
98 } | 100 } |
99 | 101 |
100 SkCodec::Result SkScanlineDecoder::start(const SkImageInfo& dstInfo) { | 102 SkCodec::Result SkScanlineDecoder::start(const SkImageInfo& dstInfo) { |
101 return this->start(dstInfo, NULL, NULL, NULL); | 103 return this->start(dstInfo, NULL, NULL, NULL); |
102 } | 104 } |
103 | 105 |
OLD | NEW |