From cecbbe2fa91d116d5c724ed9a1be9b6d82593e13 Mon Sep 17 00:00:00 2001 From: ethannicholas Date: Wed, 17 Feb 2016 11:49:43 -0800 Subject: converted skiaserve PNGs from RGBA to RGB GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1703893003 Review URL: https://codereview.chromium.org/1703893003 --- tools/skiaserve/skiaserve.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tools/skiaserve') diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp index 717e6855c4..cb58ffe9f8 100644 --- a/tools/skiaserve/skiaserve.cpp +++ b/tools/skiaserve/skiaserve.cpp @@ -106,12 +106,20 @@ static void write_png(const png_bytep rgba, png_uint_32 width, png_uint_32 heigh if (setjmp(png_jmpbuf(png))) { SkFAIL("png encode error"); } - png_set_IHDR(png, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGBA, PNG_INTERLACE_NONE, + png_set_IHDR(png, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); png_set_compression_level(png, 1); png_bytepp rows = (png_bytepp) sk_malloc_throw(height * sizeof(png_byte*)); + png_bytep pixels = (png_bytep) sk_malloc_throw(width * height * 3); for (png_size_t y = 0; y < height; ++y) { - rows[y] = (png_bytep) rgba + y * width * 4; + const png_bytep src = rgba + y * width * 4; + rows[y] = pixels + y * width * 3; + // convert from RGBA to RGB + for (png_size_t x = 0; x < width; ++x) { + rows[y][x * 3] = src[x * 4]; + rows[y][x * 3 + 1] = src[x * 4 + 1]; + rows[y][x * 3 + 2] = src[x * 4 + 2]; + } } png_set_filter(png, 0, PNG_NO_FILTERS); png_set_rows(png, info_ptr, &rows[0]); -- cgit v1.2.3