OLD | NEW |
1 #include "DMSrcSink.h" | 1 #include "DMSrcSink.h" |
2 #include "SamplePipeControllers.h" | 2 #include "SamplePipeControllers.h" |
3 #include "SkCommonFlags.h" | 3 #include "SkCommonFlags.h" |
4 #include "SkCodec.h" | 4 #include "SkCodec.h" |
5 #include "SkDocument.h" | 5 #include "SkDocument.h" |
6 #include "SkError.h" | 6 #include "SkError.h" |
7 #include "SkMultiPictureDraw.h" | 7 #include "SkMultiPictureDraw.h" |
8 #include "SkNullCanvas.h" | 8 #include "SkNullCanvas.h" |
9 #include "SkOSFile.h" | 9 #include "SkOSFile.h" |
10 #include "SkPictureData.h" | 10 #include "SkPictureData.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 return Error::Nonfatal("Uninteresting to decode image with alpha
into 565."); | 134 return Error::Nonfatal("Uninteresting to decode image with alpha
into 565."); |
135 } | 135 } |
136 canvas->drawBitmap(subset, SkIntToScalar(x), SkIntToScalar(y)); | 136 canvas->drawBitmap(subset, SkIntToScalar(x), SkIntToScalar(y)); |
137 } | 137 } |
138 } | 138 } |
139 return ""; | 139 return ""; |
140 } | 140 } |
141 | 141 |
142 SkISize ImageSrc::size() const { | 142 SkISize ImageSrc::size() const { |
143 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); | 143 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); |
144 SkBitmap bitmap; | 144 if (FLAGS_codec) { |
145 if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(), | 145 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded)); |
146 encoded->size(), | 146 if (!codec) { |
147 &bitmap, | 147 return SkISize::Make(0,0); |
148 kUnknown_SkColorType, | 148 } |
149 SkImageDecoder::kDecodeBounds_
Mode)) { | 149 SkImageInfo info; |
150 return SkISize::Make(0,0); | 150 if (!codec->getInfo(&info)) { |
| 151 return SkISize::Make(0,0); |
| 152 } |
| 153 return info.dimensions(); |
| 154 } else { |
| 155 SkBitmap bitmap; |
| 156 if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(), |
| 157 encoded->size(), |
| 158 &bitmap, |
| 159 kUnknown_SkColorType, |
| 160 SkImageDecoder::kDecodeBou
nds_Mode)) { |
| 161 return SkISize::Make(0,0); |
| 162 } |
| 163 return bitmap.dimensions(); |
151 } | 164 } |
152 return bitmap.dimensions(); | |
153 } | 165 } |
154 | 166 |
155 Name ImageSrc::name() const { | 167 Name ImageSrc::name() const { |
156 return SkOSPath::Basename(fPath.c_str()); | 168 return SkOSPath::Basename(fPath.c_str()); |
157 } | 169 } |
158 | 170 |
159 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~*/ | 171 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~*/ |
160 | 172 |
161 static const SkRect kSKPViewport = {0,0, 1000,1000}; | 173 static const SkRect kSKPViewport = {0,0, 1000,1000}; |
162 | 174 |
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 surfaces.unrefAll(); | 557 surfaces.unrefAll(); |
546 return ""; | 558 return ""; |
547 } | 559 } |
548 SkISize size() const SK_OVERRIDE { return fSize; } | 560 SkISize size() const SK_OVERRIDE { return fSize; } |
549 Name name() const SK_OVERRIDE { sk_throw(); return ""; } // No one shou
ld be calling this. | 561 Name name() const SK_OVERRIDE { sk_throw(); return ""; } // No one shou
ld be calling this. |
550 } proxy(fW, fH, pic, src.size()); | 562 } proxy(fW, fH, pic, src.size()); |
551 return fSink->draw(proxy, bitmap, stream, log); | 563 return fSink->draw(proxy, bitmap, stream, log); |
552 } | 564 } |
553 | 565 |
554 } // namespace DM | 566 } // namespace DM |
OLD | NEW |