diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 2000-01-22 23:29:21 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 2000-01-22 23:29:21 +0000 |
| commit | a74de76f9485a13ee276b2af63dd9416bda57180 (patch) | |
| tree | 38d3229c1ac81d1f95925bc9b7f9f5222a0c7716 /gdk-pixbuf | |
| parent | 706e553eb706db354b26aa241652f45f17f6aa90 (diff) | |
| download | gtk+-a74de76f9485a13ee276b2af63dd9416bda57180.tar.gz | |
0.5.0 - FedericoGDK_PIXBUF_0_5_0
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/io-pnm.c | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/io-xpm.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index ab5cf9b68a..932bfd5c09 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,12 @@ 2000-01-22 Federico Mena Quintero <federico@helixcode.com> + * gdk-pixbuf/io-pnm.c (pnm_read_raw_scanline): Return an error on + invalid pnm type. + (pnm_read_ascii_scanline): Initialize data and mask. + + * gdk-pixbuf/io-xpm.c (pixbuf_create_from_xpm): Initialize + fallbackcolor to keep gcc happy. + * configure.in: Bumped version number to 0.5.0. * gdk-pixbuf/pixops/timescale.c (dump_array): Removed unused variable. diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c index 6d61db91b7..c0b0b1df24 100644 --- a/gdk-pixbuf/io-pnm.c +++ b/gdk-pixbuf/io-pnm.c @@ -392,7 +392,6 @@ pnm_read_raw_scanline (PnmLoaderContext *context) default: g_warning ("io-pnm.c: Illegal raw pnm type!\n"); return PNM_FATAL_ERR; - break; } numpix = MIN (numpix, context->width - context->output_col); @@ -418,7 +417,7 @@ pnm_read_raw_scanline (PnmLoaderContext *context) break; default: g_warning ("io-pnm.c: Illegal raw pnm type!\n"); - break; + return PNM_FATAL_ERR; } memcpy (context->dptr + offset, inbuf->next_byte, numbytes); @@ -458,6 +457,8 @@ pnm_read_ascii_scanline (PnmLoaderContext *context) g_return_val_if_fail (context != NULL, PNM_FATAL_ERR); + data = mask = 0; + inbuf = &context->inbuf; context->dptr = context->pixels + diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index b2f0715c62..69a3a4e79e 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -330,6 +330,8 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl _XPMColor *colors, *color, *fallbackcolor; guchar *pixels, *pixtmp; + fallbackcolor = NULL; + buffer = (*get_buf) (op_header, handle); if (!buffer) { g_warning ("No XPM header found"); |