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

0.5.0 - Federico

Browse Source
This commit is contained in:
Arturo Espinosa
2000-01-22 23:29:21 +00:00
parent 706e553eb7
commit a74de76f94
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk-pixbuf/ChangeLog
View File

@ -1,5 +1,12 @@
2000-01-22 Federico Mena Quintero <federico@helixcode.com> 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. * configure.in: Bumped version number to 0.5.0.
* gdk-pixbuf/pixops/timescale.c (dump_array): Removed unused variable. * gdk-pixbuf/pixops/timescale.c (dump_array): Removed unused variable.

5
gdk-pixbuf/io-pnm.c
View File

@ -392,7 +392,6 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
default: default:
g_warning ("io-pnm.c: Illegal raw pnm type!\n"); g_warning ("io-pnm.c: Illegal raw pnm type!\n");
return PNM_FATAL_ERR; return PNM_FATAL_ERR;
break;
} }
numpix = MIN (numpix, context->width - context->output_col); numpix = MIN (numpix, context->width - context->output_col);
@ -418,7 +417,7 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
break; break;
default: default:
g_warning ("io-pnm.c: Illegal raw pnm type!\n"); g_warning ("io-pnm.c: Illegal raw pnm type!\n");
break; return PNM_FATAL_ERR;
} }
memcpy (context->dptr + offset, inbuf->next_byte, numbytes); 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); g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
data = mask = 0;
inbuf = &context->inbuf; inbuf = &context->inbuf;
context->dptr = context->pixels + context->dptr = context->pixels +

2
gdk-pixbuf/io-xpm.c
View File

@ -330,6 +330,8 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum buf_op op, gpointer handl
_XPMColor *colors, *color, *fallbackcolor; _XPMColor *colors, *color, *fallbackcolor;
guchar *pixels, *pixtmp; guchar *pixels, *pixtmp;
fallbackcolor = NULL;
buffer = (*get_buf) (op_header, handle); buffer = (*get_buf) (op_header, handle);
if (!buffer) { if (!buffer) {
g_warning ("No XPM header found"); g_warning ("No XPM header found");