samplecode/SamplePictFile.cpp - Issue 1812323003: Remove uses of SkImageDecoder from samplecode

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: samplecode/SamplePictFile.cpp

Issue 1812323003: Remove uses of SkImageDecoder from samplecode (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: samplecode/SamplePictFile.cpp

diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp

index b456aef1bfd7ae49be391df679e83cd83f0668c0..c1958c8973136a53201d5cecad66c21a7c051dd3 100644

--- a/samplecode/SamplePictFile.cpp

+++ b/samplecode/SamplePictFile.cpp

@@ -5,13 +5,13 @@

* found in the LICENSE file.

+#include "DecodeFile.h"

#include "SampleCode.h"

#include "SkDumpCanvas.h"

#include "SkView.h"

#include "SkCanvas.h"

#include "SkGradientShader.h"

#include "SkGraphics.h"

-#include "SkImageDecoder.h"

#include "SkOSFile.h"

#include "SkPath.h"

#include "SkPicture.h"

@@ -153,7 +153,7 @@ private:

sk_sp<SkPicture> pic;

SkBitmap bm;

- if (SkImageDecoder::DecodeFile(path, &bm)) {

+ if (decode_file(path, &bm)) {

bm.setImmutable();

SkPictureRecorder recorder;

SkCanvas* can = recorder.beginRecording(SkIntToScalar(bm.width()),

« no previous file with comments | « samplecode/SamplePdfFileViewer.cpp ('k') | samplecode/SamplePoints.cpp » ('j') | no next file with comments »