From 2f06fe942a92e2d1be1f422b5003a8f46bf9255d Mon Sep 17 00:00:00 2001 From: chevalam Date: Fri, 16 May 2014 11:19:09 +0530 Subject: Remove cairo code from skia-util.cpp --- src/skia-util.cpp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/skia-util.cpp') diff --git a/src/skia-util.cpp b/src/skia-util.cpp index 3f26e18..2ae2954 100644 --- a/src/skia-util.cpp +++ b/src/skia-util.cpp @@ -10,8 +10,8 @@ #include #include - -#include +#include +#include #include "caskbench.h" @@ -21,8 +21,7 @@ write_image_file_skia (const char *fname, caskbench_context_t *context) { SkBitmap bitmap; void * data; - cairo_surface_t* surface; - + SkString path(fname); bitmap.setConfig(SkBitmap::kARGB_8888_Config, context->canvas_width, context->canvas_height); SkImageInfo info = SkImageInfo::Make(context->canvas_width, context->canvas_height, @@ -34,21 +33,7 @@ write_image_file_skia (const char *fname, caskbench_context_t *context) warnx("Could not read pixels from skia device\n"); return; } - - data = bitmap.getPixels(); - assert(data); - surface = cairo_image_surface_create_for_data((unsigned char*)data, - CAIRO_FORMAT_ARGB32, - context->canvas_width, context->canvas_height, - 4 * context->canvas_width); - - cairo_status_t status = cairo_surface_status (surface); - if (status != CAIRO_STATUS_SUCCESS) { - warnx("Error writing skia surface to file: %s\n", cairo_status_to_string(status)); - return; - } - cairo_surface_write_to_png (surface, fname); - cairo_surface_destroy(surface); + SkImageEncoder::EncodeFile(path.c_str(), bitmap, SkImageEncoder::kPNG_Type, 0); } /* -- cgit v1.3.1-4-g156e