OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 #include "SkTypes.h" | 9 #include "SkTypes.h" |
10 | 10 |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 } | 249 } |
250 | 250 |
251 ///////////////////////////////////////////////////////////////////////// | 251 ///////////////////////////////////////////////////////////////////////// |
252 | 252 |
253 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); | 253 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); |
254 | 254 |
255 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { | 255 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { |
256 SkImageDecoder* decoder = image_decoder_from_stream(stream); | 256 SkImageDecoder* decoder = image_decoder_from_stream(stream); |
257 if (NULL == decoder) { | 257 if (NULL == decoder) { |
258 // If no image decoder specific to the stream exists, use SkImageDecoder
_WIC. | 258 // If no image decoder specific to the stream exists, use SkImageDecoder
_WIC. |
259 return SkNEW(SkImageDecoder_WIC); | 259 return new SkImageDecoder_WIC; |
260 } else { | 260 } else { |
261 return decoder; | 261 return decoder; |
262 } | 262 } |
263 } | 263 } |
264 | 264 |
265 ///////////////////////////////////////////////////////////////////////// | 265 ///////////////////////////////////////////////////////////////////////// |
266 | 266 |
267 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { | 267 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { |
268 return NULL; | 268 return NULL; |
269 } | 269 } |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
440 static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) { | 440 static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) { |
441 switch (t) { | 441 switch (t) { |
442 case SkImageEncoder::kBMP_Type: | 442 case SkImageEncoder::kBMP_Type: |
443 case SkImageEncoder::kICO_Type: | 443 case SkImageEncoder::kICO_Type: |
444 case SkImageEncoder::kJPEG_Type: | 444 case SkImageEncoder::kJPEG_Type: |
445 case SkImageEncoder::kPNG_Type: | 445 case SkImageEncoder::kPNG_Type: |
446 break; | 446 break; |
447 default: | 447 default: |
448 return NULL; | 448 return NULL; |
449 } | 449 } |
450 return SkNEW_ARGS(SkImageEncoder_WIC, (t)); | 450 return new SkImageEncoder_WIC(t); |
451 } | 451 } |
452 | 452 |
453 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory); | 453 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory); |
454 | 454 |
455 static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) { | 455 static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) { |
456 SkImageDecoder::Format format; | 456 SkImageDecoder::Format format; |
457 SkImageDecoder_WIC codec; | 457 SkImageDecoder_WIC codec; |
458 if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICM
ode, &format)) { | 458 if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICM
ode, &format)) { |
459 format = SkImageDecoder::kUnknown_Format; | 459 format = SkImageDecoder::kUnknown_Format; |
460 } | 460 } |
461 return format; | 461 return format; |
462 } | 462 } |
463 | 463 |
464 static SkImageDecoder_FormatReg gFormatReg(get_format_wic); | 464 static SkImageDecoder_FormatReg gFormatReg(get_format_wic); |
OLD | NEW |