AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disable using codecs until that can work in chrome

Browse Source 
BUG=skia:3275
TBR=

Review URL: https://codereview.chromium.org/820343002
This commit is contained in:
reed 2014-12-25 20:41:13 -08:00 committed by Commit bot
parent 3442111110
commit 2906d4a387
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gm/cgm.c
View File

@ -67,8 +67,10 @@ void sk_test_c_api(sk_canvas_t* canvas) {
sk_image_t* img1 = sk_image_new_from_data(data); sk_image_t* img1 = sk_image_new_from_data(data);
sk_data_unref(data); sk_data_unref(data);
if (img1) {
sk_canvas_draw_image(canvas, img1, W/2, H/2, NULL); sk_canvas_draw_image(canvas, img1, W/2, H/2, NULL);
sk_image_unref(img1); sk_image_unref(img1);
}
} }

7
src/c/sk_surface.cpp
View File

@ -233,8 +233,11 @@ sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pi
#include "SkDecodingImageGenerator.h" #include "SkDecodingImageGenerator.h"
sk_image_t* sk_image_new_from_data(const sk_data_t* cdata) { sk_image_t* sk_image_new_from_data(const sk_data_t* cdata) {
SkImageGenerator* gen = SkDecodingImageGenerator::Create(AsData(cdata), SkImageGenerator* gen = NULL;
SkDecodingImageGenerator::Options()); #if 0
// enable this when SkDecodingImageGenerator is available in chrome (decode codecs)
gen = SkDecodingImageGenerator::Create(AsData(cdata), SkDecodingImageGenerator::Options());
#endif
if (NULL == gen) { if (NULL == gen) {
return NULL; return NULL;
} }