| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 "Resources.h" | 8 #include "Resources.h" |
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
| 10 #include "SkCommandLineFlags.h" | 10 #include "SkCommandLineFlags.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 sk_sp<SkImage> GetResourceAsImage(const char* resource) { | 35 sk_sp<SkImage> GetResourceAsImage(const char* resource) { |
| 36 SkString path = GetResourcePath(resource); | 36 SkString path = GetResourcePath(resource); |
| 37 sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str())); | 37 sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str())); |
| 38 return SkImage::MakeFromEncoded(resourceData); | 38 return SkImage::MakeFromEncoded(resourceData); |
| 39 } | 39 } |
| 40 | 40 |
| 41 SkStreamAsset* GetResourceAsStream(const char* resource) { | 41 SkStreamAsset* GetResourceAsStream(const char* resource) { |
| 42 SkString resourcePath = GetResourcePath(resource); | 42 SkString resourcePath = GetResourcePath(resource); |
| 43 SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); | 43 SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); |
| 44 if (!stream->isValid()) { | 44 if (stream->isValid()) { |
| 45 return stream.release(); |
| 46 } else { |
| 45 SkDebugf("Resource %s not found.\n", resource); | 47 SkDebugf("Resource %s not found.\n", resource); |
| 46 return nullptr; | 48 return nullptr; |
| 47 } | 49 } |
| 48 return stream.release(); | |
| 49 } | 50 } |
| 50 | 51 |
| 51 sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { | 52 sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { |
| 52 SkAutoTDelete<SkStreamAsset> stream(GetResourceAsStream(resource)); | 53 SkAutoTDelete<SkStreamAsset> stream(GetResourceAsStream(resource)); |
| 53 if (!stream) { | 54 if (!stream) { |
| 54 return nullptr; | 55 return nullptr; |
| 55 } | 56 } |
| 56 return SkTypeface::MakeFromStream(stream.release()); | 57 return SkTypeface::MakeFromStream(stream.release()); |
| 57 } | 58 } |
| OLD | NEW |