diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-29 19:22:20 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-29 19:22:20 +0000 |
| commit | 84cfce14fec1f963fedaa3c81b8f3faccd3db13a (patch) | |
| tree | f3423e9693159eb8766f619008a9559c08f3d9be /samplecode | |
| parent | ed8d6bb2be0ed6a20841573682afaa46dea15175 (diff) | |
use SkStream factory for files, and check for null (file-not-found) speedup sampleapp's animation
BUG=
Review URL: https://codereview.chromium.org/16173003
git-svn-id: http://skia.googlecode.com/svn/trunk@9327 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleApp.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SamplePicture.cpp | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 40c9d1f337..c5910ef8d2 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -74,7 +74,7 @@ SkTCPServer gServer; #endif #define ANIMATING_EVENTTYPE "nextSample" -#define ANIMATING_DELAY 750 +#define ANIMATING_DELAY 250 #ifdef SK_DEBUG #define FPS_REPEAT_MULTIPLIER 1 diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp index eaec829843..825e561654 100644 --- a/samplecode/SamplePicture.cpp +++ b/samplecode/SamplePicture.cpp @@ -33,14 +33,16 @@ #include "SkImageRef_GlobalPool.h" static SkBitmap load_bitmap() { - SkStream* stream = new SkFILEStream("/skimages/sesame_street_ensemble-hp.jpg"); - SkAutoUnref aur(stream); - SkBitmap bm; - if (SkImageDecoder::DecodeStream(stream, &bm, SkBitmap::kNo_Config, - SkImageDecoder::kDecodeBounds_Mode)) { - SkPixelRef* pr = new SkImageRef_GlobalPool(stream, bm.config(), 1); - bm.setPixelRef(pr)->unref(); + SkStream* stream = SkStream::NewFromFile("/skimages/sesame_street_ensemble-hp.jpg"); + if (stream) { + SkAutoUnref aur(stream); + + if (SkImageDecoder::DecodeStream(stream, &bm, SkBitmap::kNo_Config, + SkImageDecoder::kDecodeBounds_Mode)) { + SkPixelRef* pr = new SkImageRef_GlobalPool(stream, bm.config(), 1); + bm.setPixelRef(pr)->unref(); + } } return bm; } |