| 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 #include "SkMovie.h" | 8 #include "SkMovie.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkPaint.h" | 10 #include "SkPaint.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 #include "SkStream.h" | 85 #include "SkStream.h" |
| 86 | 86 |
| 87 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) { | 87 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) { |
| 88 SkMemoryStream stream(data, length, false); | 88 SkMemoryStream stream(data, length, false); |
| 89 return SkMovie::DecodeStream(&stream); | 89 return SkMovie::DecodeStream(&stream); |
| 90 } | 90 } |
| 91 | 91 |
| 92 SkMovie* SkMovie::DecodeFile(const char path[]) { | 92 SkMovie* SkMovie::DecodeFile(const char path[]) { |
| 93 SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(path)); | 93 SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(path)); |
| 94 return stream.get() ? SkMovie::DecodeStream(stream) : NULL; | 94 return stream.get() ? SkMovie::DecodeStream(stream) : nullptr; |
| 95 } | 95 } |
| OLD | NEW |