OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2008 The Android Open Source Project | 2 * Copyright 2008 The Android Open Source Project |
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 "SkCGUtils.h" | 8 #include "SkCGUtils.h" |
9 #include "SkColorPriv.h" | 9 #include "SkColorPriv.h" |
10 #include "SkImageDecoder.h" | 10 #include "SkImageDecoder.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 } | 214 } |
215 | 215 |
216 /////////////////////////////////////////////////////////////////////////////// | 216 /////////////////////////////////////////////////////////////////////////////// |
217 | 217 |
218 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); | 218 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); |
219 | 219 |
220 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { | 220 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { |
221 SkImageDecoder* decoder = image_decoder_from_stream(stream); | 221 SkImageDecoder* decoder = image_decoder_from_stream(stream); |
222 if (NULL == decoder) { | 222 if (NULL == decoder) { |
223 // If no image decoder specific to the stream exists, use SkImageDecoder
_CG. | 223 // If no image decoder specific to the stream exists, use SkImageDecoder
_CG. |
224 return SkNEW(SkImageDecoder_CG); | 224 return new SkImageDecoder_CG; |
225 } else { | 225 } else { |
226 return decoder; | 226 return decoder; |
227 } | 227 } |
228 } | 228 } |
229 | 229 |
230 ///////////////////////////////////////////////////////////////////////// | 230 ///////////////////////////////////////////////////////////////////////// |
231 | 231 |
232 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { | 232 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { |
233 return NULL; | 233 return NULL; |
234 } | 234 } |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 switch (t) { | 337 switch (t) { |
338 case SkImageEncoder::kICO_Type: | 338 case SkImageEncoder::kICO_Type: |
339 case SkImageEncoder::kBMP_Type: | 339 case SkImageEncoder::kBMP_Type: |
340 case SkImageEncoder::kGIF_Type: | 340 case SkImageEncoder::kGIF_Type: |
341 case SkImageEncoder::kJPEG_Type: | 341 case SkImageEncoder::kJPEG_Type: |
342 case SkImageEncoder::kPNG_Type: | 342 case SkImageEncoder::kPNG_Type: |
343 break; | 343 break; |
344 default: | 344 default: |
345 return NULL; | 345 return NULL; |
346 } | 346 } |
347 return SkNEW_ARGS(SkImageEncoder_CG, (t)); | 347 return new SkImageEncoder_CG(t); |
348 } | 348 } |
349 | 349 |
350 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_cg_factory); | 350 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_cg_factory); |
351 | 351 |
352 #ifdef SK_BUILD_FOR_IOS | 352 #ifdef SK_BUILD_FOR_IOS |
353 class SkPNGImageEncoder_IOS : public SkImageEncoder_CG { | 353 class SkPNGImageEncoder_IOS : public SkImageEncoder_CG { |
354 public: | 354 public: |
355 SkPNGImageEncoder_IOS() | 355 SkPNGImageEncoder_IOS() |
356 : SkImageEncoder_CG(kPNG_Type) { | 356 : SkImageEncoder_CG(kPNG_Type) { |
357 } | 357 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 | 394 |
395 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); | 395 SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc); |
396 const CFStringRef name = CGImageSourceGetType(imageSrc); | 396 const CFStringRef name = CGImageSourceGetType(imageSrc); |
397 if (NULL == name) { | 397 if (NULL == name) { |
398 return SkImageDecoder::kUnknown_Format; | 398 return SkImageDecoder::kUnknown_Format; |
399 } | 399 } |
400 return UTType_to_Format(name); | 400 return UTType_to_Format(name); |
401 } | 401 } |
402 | 402 |
403 static SkImageDecoder_FormatReg gFormatReg(get_format_cg); | 403 static SkImageDecoder_FormatReg gFormatReg(get_format_cg); |
OLD | NEW |