aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2014-12-25 20:41:13 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-25 20:41:13 -0800
commit2906d4a387ad566cf26bf262278895085e03b7ba (patch)
treeed8c0ce349a6351fbec3cfba24d7d14d7bf8145f
parent344211111091a6eedac1a725ad77a3f814ea406e (diff)
disable using codecs until that can work in chrome
BUG=skia:3275 TBR= Review URL: https://codereview.chromium.org/820343002
-rw-r--r--gm/cgm.c6
-rw-r--r--src/c/sk_surface.cpp7
2 files changed, 9 insertions, 4 deletions
diff --git a/gm/cgm.c b/gm/cgm.c
index 5a20a7d1bf..8e65bda307 100644
--- a/gm/cgm.c
+++ b/gm/cgm.c
@@ -67,8 +67,10 @@ void sk_test_c_api(sk_canvas_t* canvas) {
sk_image_t* img1 = sk_image_new_from_data(data);
sk_data_unref(data);
- sk_canvas_draw_image(canvas, img1, W/2, H/2, NULL);
- sk_image_unref(img1);
+ if (img1) {
+ sk_canvas_draw_image(canvas, img1, W/2, H/2, NULL);
+ sk_image_unref(img1);
+ }
}
diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp
index 59c810a56e..b60596008f 100644
--- a/src/c/sk_surface.cpp
+++ b/src/c/sk_surface.cpp
@@ -233,8 +233,11 @@ sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pi
#include "SkDecodingImageGenerator.h"
sk_image_t* sk_image_new_from_data(const sk_data_t* cdata) {
- SkImageGenerator* gen = SkDecodingImageGenerator::Create(AsData(cdata),
- SkDecodingImageGenerator::Options());
+ SkImageGenerator* gen = NULL;
+#if 0
+ // enable this when SkDecodingImageGenerator is available in chrome (decode codecs)
+ gen = SkDecodingImageGenerator::Create(AsData(cdata), SkDecodingImageGenerator::Options());
+#endif
if (NULL == gen) {
return NULL;
}