From bd943182b7cfff4b0dec2fd64eed82dad6c40484 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 15 Jul 1999 06:42:42 +0000 Subject: [PATCH] add raph@gimp.org's fix to the jpeg indexing routine 1999-07-15 Larry Ewing * src/io-jpeg.c (image_load): add raph@gimp.org's fix to the jpeg indexing routine * src/testpixbuf.c (main): fix up the file routines a little so that you can load multiple files given the file names --- demos/testpixbuf.c | 22 +++++++++++++++++++--- gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/io-jpeg.c | 4 ++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index 488890bc87..27a0975774 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -122,6 +122,9 @@ new_testrgb_window (GdkPixBuf *pixbuf) int main (int argc, char **argv) { + int i; + int found_valid = FALSE; + GdkPixBuf *pixbuf; gtk_init (&argc, &argv); @@ -132,11 +135,24 @@ main (int argc, char **argv) gtk_widget_set_default_colormap (gdk_rgb_get_cmap ()); gtk_widget_set_default_visual (gdk_rgb_get_visual ()); - pixbuf = gdk_pixbuf_load_image ("test.gif"); - new_testrgb_window (pixbuf); + i = 1; + for (i = 1; i < argc; i++) + { + if (argv[i]) + { + pixbuf = gdk_pixbuf_load_image (argv[i]); + + if (pixbuf) + { + new_testrgb_window (pixbuf); + found_valid = TRUE; + } + } + } - gtk_main (); + if (found_valid) + gtk_main (); return 0; } diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 927a3df4e5..78de67eafe 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +1999-07-15 Larry Ewing + + * src/io-jpeg.c (image_load): add raph@gimp.org's fix to the jpeg + indexing routine + + * src/testpixbuf.c (main): fix up the file routines a little so + that you can load multiple files given the file names + 1999-07-14 Larry Ewing * src/testpixbuf.c (expose_func): added an almost proper expose diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index b75155dbd8..f8ac8139de 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -99,7 +99,7 @@ GdkPixBuf *image_load(FILE *f) unsigned char *from, *to; from = lines[i]+w-1; to = lines[i]+w*3-3; - for (j=w-1;j>=0;j++) { + for (j=w-1;j>=0;j--) { to[0] = from[0]; to[1] = from[0]; to[2] = from[0]; @@ -120,7 +120,7 @@ GdkPixBuf *image_load(FILE *f) return NULL; pixbuf->ref_count = 0; pixbuf->unref_func = NULL; - + return pixbuf; }