| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 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 "SkCodec.h" | 8 #include "SkCodec.h" |
| 9 #include "SkData.h" | 9 #include "SkData.h" |
| 10 #include "SkCodec_libbmp.h" | 10 #include "SkCodec_libbmp.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 } | 39 } |
| 40 | 40 |
| 41 SkCodec* SkCodec::NewFromData(SkData* data) { | 41 SkCodec* SkCodec::NewFromData(SkData* data) { |
| 42 if (!data) { | 42 if (!data) { |
| 43 return NULL; | 43 return NULL; |
| 44 } | 44 } |
| 45 return NewFromStream(SkNEW_ARGS(SkMemoryStream, (data))); | 45 return NewFromStream(SkNEW_ARGS(SkMemoryStream, (data))); |
| 46 } | 46 } |
| 47 | 47 |
| 48 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream) | 48 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream) |
| 49 : fInfo(info) | 49 : INHERITED(info) |
| 50 , fInfo(info) |
| 50 , fStream(stream) | 51 , fStream(stream) |
| 51 , fNeedsRewind(false) | 52 , fNeedsRewind(false) |
| 52 {} | 53 {} |
| 53 | 54 |
| 54 bool SkCodec::rewindIfNeeded() { | 55 bool SkCodec::rewindIfNeeded() { |
| 55 // Store the value of fNeedsRewind so we can update it. Next read will | 56 // Store the value of fNeedsRewind so we can update it. Next read will |
| 56 // require a rewind. | 57 // require a rewind. |
| 57 const bool neededRewind = fNeedsRewind; | 58 const bool neededRewind = fNeedsRewind; |
| 58 fNeedsRewind = true; | 59 fNeedsRewind = true; |
| 59 return !neededRewind || fStream->rewind(); | 60 return !neededRewind || fStream->rewind(); |
| 60 } | 61 } |
| OLD | NEW |