| 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 #include "SkMovie.h" | 10 #include "SkMovie.h" |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 | 425 |
| 426 // save index | 426 // save index |
| 427 fLastDrawIndex = lastIndex; | 427 fLastDrawIndex = lastIndex; |
| 428 return true; | 428 return true; |
| 429 } | 429 } |
| 430 | 430 |
| 431 /////////////////////////////////////////////////////////////////////////////// | 431 /////////////////////////////////////////////////////////////////////////////// |
| 432 | 432 |
| 433 #include "SkTRegistry.h" | 433 #include "SkTRegistry.h" |
| 434 | 434 |
| 435 SkMovie* Factory(SkStream* stream) { | 435 SkMovie* Factory(SkStreamRewindable* stream) { |
| 436 char buf[GIF_STAMP_LEN]; | 436 char buf[GIF_STAMP_LEN]; |
| 437 if (stream->read(buf, GIF_STAMP_LEN) == GIF_STAMP_LEN) { | 437 if (stream->read(buf, GIF_STAMP_LEN) == GIF_STAMP_LEN) { |
| 438 if (memcmp(GIF_STAMP, buf, GIF_STAMP_LEN) == 0 || | 438 if (memcmp(GIF_STAMP, buf, GIF_STAMP_LEN) == 0 || |
| 439 memcmp(GIF87_STAMP, buf, GIF_STAMP_LEN) == 0 || | 439 memcmp(GIF87_STAMP, buf, GIF_STAMP_LEN) == 0 || |
| 440 memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) { | 440 memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) { |
| 441 // must rewind here, since our construct wants to re-read the data | 441 // must rewind here, since our construct wants to re-read the data |
| 442 stream->rewind(); | 442 stream->rewind(); |
| 443 return SkNEW_ARGS(SkGIFMovie, (stream)); | 443 return SkNEW_ARGS(SkGIFMovie, (stream)); |
| 444 } | 444 } |
| 445 } | 445 } |
| 446 return NULL; | 446 return NULL; |
| 447 } | 447 } |
| 448 | 448 |
| 449 static SkTRegistry<SkMovie*(*)(SkStream*)> gReg(Factory); | 449 static SkTRegistry<SkMovie*(*)(SkStreamRewindable*)> gReg(Factory); |
| OLD | NEW |