Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: tools/skiaserve/skiaserve.cpp

Issue 1703893003: converted skiaserve PNGs from RGBA to RGB (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/debugger/SkDebugCanvas.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/skiaserve/skiaserve.cpp
diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index 119f065ac071d10632fbaf463b3dea404ba78d57..1bba7bb30b9b6f23c611ec131c488cea284f5972 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]);
« no previous file with comments | « tools/debugger/SkDebugCanvas.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698