callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle 4-channel pixbufs when saving to jpeg.

Browse Source
This commit is contained in:
Matthias Clasen
2004-09-13 23:34:34 +00:00
parent 221233a981
commit 01743e7235
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Sep 13 19:31:34 2004 Matthias Clasen <maclas@gmx.de>
* io-jpeg.c (real_save_jpeg): Drop the alpha channel
when saving 4-channel pixbufs. (#152450, Emmanuel Pacaud)
2004-09-09 Matthias Clasen <mclasen@redhat.com> 2004-09-09 Matthias Clasen <mclasen@redhat.com>
* makegdkpixbufalias.pl: Use the short prefix "IA__" for * makegdkpixbufalias.pl: Use the short prefix "IA__" for

4
gdk-pixbuf/io-jpeg.c
View File

@ -872,6 +872,7 @@ real_save_jpeg (GdkPixbuf *pixbuf,
int i, j; int i, j;
int w, h = 0; int w, h = 0;
int rowstride = 0; int rowstride = 0;
int n_channels;
struct error_handler_data jerr; struct error_handler_data jerr;
ToFunctionDestinationManager to_callback_destmgr; ToFunctionDestinationManager to_callback_destmgr;
@ -922,6 +923,7 @@ real_save_jpeg (GdkPixbuf *pixbuf,
} }
rowstride = gdk_pixbuf_get_rowstride (pixbuf); rowstride = gdk_pixbuf_get_rowstride (pixbuf);
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
w = gdk_pixbuf_get_width (pixbuf); w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf); h = gdk_pixbuf_get_height (pixbuf);
@ -994,7 +996,7 @@ real_save_jpeg (GdkPixbuf *pixbuf,
while (cinfo.next_scanline < cinfo.image_height) { while (cinfo.next_scanline < cinfo.image_height) {
/* convert scanline from ARGB to RGB packed */ /* convert scanline from ARGB to RGB packed */
for (j = 0; j < w; j++) for (j = 0; j < w; j++)
memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*3]), 3); memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*n_channels]), 3);
/* write scanline */ /* write scanline */
jbuf = (JSAMPROW *)(&buf); jbuf = (JSAMPROW *)(&buf);