aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleIdentityScale.cpp
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-03-18 15:48:49 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-18 15:48:49 -0700
commitd15750c0c7766ecab7022ea9b2f9e89a9132cbc2 (patch)
treee697c7285402a9b32a1b5b390e20e73a253081c0 /samplecode/SampleIdentityScale.cpp
parent07ec54d8e6c0e7e6ea11cde867c00bd29da79063 (diff)
Remove uses of SkImageDecoder from samplecode
Diffstat (limited to 'samplecode/SampleIdentityScale.cpp')
-rw-r--r--samplecode/SampleIdentityScale.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp
index 5a4e39d36b..b6af3ce34f 100644
--- a/samplecode/SampleIdentityScale.cpp
+++ b/samplecode/SampleIdentityScale.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+#include "DecodeFile.h"
#include "gm.h"
#include "Resources.h"
@@ -12,7 +13,6 @@
#include "SkBlurMaskFilter.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
-#include "SkImageDecoder.h"
#include "SkPath.h"
#include "SkRandom.h"
#include "SkStream.h"
@@ -25,16 +25,7 @@ class IdentityScaleView : public SampleView {
public:
IdentityScaleView(const char imageFilename[]) {
SkString resourcePath = GetResourcePath(imageFilename);
- SkImageDecoder* codec = nullptr;
- SkFILEStream stream(resourcePath.c_str());
- if (stream.isValid()) {
- codec = SkImageDecoder::Factory(&stream);
- }
- if (codec) {
- stream.rewind();
- codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
- delete codec;
- } else {
+ if (!decode_file(resourcePath.c_str(), &fBM)) {
fBM.allocN32Pixels(1, 1);
*(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad
}