Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: samplecode/SampleCamera.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « samplecode/SampleBitmapRect.cpp ('k') | samplecode/SampleConcavePaths.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleCamera.cpp
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index b860917f3fbae8af849960bcb84498ca0c03a206..ed6cc528293536f534555053dd45c8da3d87b907 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+#include "DecodeFile.h"
#include "SampleCode.h"
#include "SkAnimTimer.h"
#include "SkView.h"
@@ -17,7 +18,6 @@
#include "SkShader.h"
#include "SkUtils.h"
#include "SkRandom.h"
-#include "SkImageDecoder.h"
class CameraView : public SampleView {
SkTDArray<SkShader*> fShaders;
@@ -33,7 +33,7 @@ public:
SkString str;
str.printf("/skimages/elephant%d.jpeg", i);
SkBitmap bm;
- if (SkImageDecoder::DecodeFile(str.c_str(), &bm)) {
+ if (decode_file(str.c_str(), &bm)) {
SkRect src = { 0, 0, SkIntToScalar(bm.width()), SkIntToScalar(bm.height()) };
SkRect dst = { -150, -150, 150, 150 };
SkMatrix matrix;
« no previous file with comments | « samplecode/SampleBitmapRect.cpp ('k') | samplecode/SampleConcavePaths.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698