| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 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 | 9 |
| 10 #ifndef SkImageDecoder_DEFINED | 10 #ifndef SkImageDecoder_DEFINED |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 | 281 |
| 282 /** | 282 /** |
| 283 * Decode a rectangle subset in the image. | 283 * Decode a rectangle subset in the image. |
| 284 * The method can only be called after buildTileIndex(). | 284 * The method can only be called after buildTileIndex(). |
| 285 * | 285 * |
| 286 * Return true for success. | 286 * Return true for success. |
| 287 * Return false if the index is never built or failing in decoding. | 287 * Return false if the index is never built or failing in decoding. |
| 288 */ | 288 */ |
| 289 bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref
); | 289 bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref
); |
| 290 | 290 |
| 291 /** | 291 SK_ATTR_DEPRECATED("use decodeSubset() instead") |
| 292 * @Deprecated | |
| 293 * Use decodeSubset instead. | |
| 294 */ | |
| 295 bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect, SkBitmap::Config pr
ef) { | 292 bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect, SkBitmap::Config pr
ef) { |
| 296 return this->decodeSubset(bitmap, rect, pref); | 293 return this->decodeSubset(bitmap, rect, pref); |
| 297 } | 294 } |
| 298 | 295 |
| 299 /** Given a stream, this will try to find an appropriate decoder object. | 296 /** Given a stream, this will try to find an appropriate decoder object. |
| 300 If none is found, the method returns NULL. | 297 If none is found, the method returns NULL. |
| 301 */ | 298 */ |
| 302 static SkImageDecoder* Factory(SkStreamRewindable*); | 299 static SkImageDecoder* Factory(SkStreamRewindable*); |
| 303 | 300 |
| 304 /** Decode the image stored in the specified file, and store the result | 301 /** Decode the image stored in the specified file, and store the result |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 DECLARE_DECODER_CREATOR(WBMPImageDecoder); | 531 DECLARE_DECODER_CREATOR(WBMPImageDecoder); |
| 535 DECLARE_DECODER_CREATOR(WEBPImageDecoder); | 532 DECLARE_DECODER_CREATOR(WEBPImageDecoder); |
| 536 | 533 |
| 537 | 534 |
| 538 // Typedefs to make registering decoder and formatter callbacks easier. | 535 // Typedefs to make registering decoder and formatter callbacks easier. |
| 539 // These have to be defined outside SkImageDecoder. :( | 536 // These have to be defined outside SkImageDecoder. :( |
| 540 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)> SkImageDecod
er_DecodeReg; | 537 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)> SkImageDecod
er_DecodeReg; |
| 541 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecod
er_FormatReg; | 538 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecod
er_FormatReg; |
| 542 | 539 |
| 543 #endif | 540 #endif |
| OLD | NEW |