Commit 9d72f811 authored by Elliot Lee's avatar Elliot Lee
Browse files

Part 2 of previous commit (aka "it compiles now, ma")



Part 2 of previous commit (aka "it compiles now, ma")
parent 3ddaa735
...@@ -195,7 +195,7 @@ static GdkPixbufModule file_formats [] = { ...@@ -195,7 +195,7 @@ static GdkPixbufModule file_formats [] = {
{ "ras", pixbuf_check_sunras, NULL, NULL, NULL, NULL, NULL, NULL }, { "ras", pixbuf_check_sunras, NULL, NULL, NULL, NULL, NULL, NULL },
{ "ico", pixbuf_check_ico, NULL, NULL, NULL, NULL, NULL, NULL }, { "ico", pixbuf_check_ico, NULL, NULL, NULL, NULL, NULL, NULL },
{ "bmp", pixbuf_check_bmp, NULL, NULL, NULL, NULL, NULL, NULL }, { "bmp", pixbuf_check_bmp, NULL, NULL, NULL, NULL, NULL, NULL },
{ "wbmp", pixbuf_check_wbmp, NULL, NULL, NULL, NULL, NULL, NULL } { "wbmp", pixbuf_check_wbmp, NULL, NULL, NULL, NULL, NULL, NULL },
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
}; };
......
...@@ -399,7 +399,7 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader, ...@@ -399,7 +399,7 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader,
if (priv->header_buf_offset >= LOADER_HEADER_SIZE) if (priv->header_buf_offset >= LOADER_HEADER_SIZE)
{ {
if (gdk_pixbuf_loader_load_module (loader) == 0) if (gdk_pixbuf_loader_load_module (loader, NULL) == 0)
return 0; return 0;
} }
...@@ -563,7 +563,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader) ...@@ -563,7 +563,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
/* We have less the 128 bytes in the image. Flush it, and keep going. */ /* We have less the 128 bytes in the image. Flush it, and keep going. */
if (priv->image_module == NULL) if (priv->image_module == NULL)
gdk_pixbuf_loader_load_module (loader); gdk_pixbuf_loader_load_module (loader, NULL);
if (priv->image_module && priv->image_module->stop_load) if (priv->image_module && priv->image_module->stop_load)
priv->image_module->stop_load (priv->context); priv->image_module->stop_load (priv->context);
......
...@@ -79,7 +79,7 @@ GdkPixbuf *gdk_pixbuf__wbmp_image_load(FILE * f) ...@@ -79,7 +79,7 @@ GdkPixbuf *gdk_pixbuf__wbmp_image_load(FILE * f)
{ {
size_t length; size_t length;
char membuf[4096]; char membuf[4096];
struct bmp_progressive_state *State; struct wbmp_progressive_state *State;
GdkPixbuf *pb; GdkPixbuf *pb;
...@@ -98,7 +98,7 @@ GdkPixbuf *gdk_pixbuf__wbmp_image_load(FILE * f) ...@@ -98,7 +98,7 @@ GdkPixbuf *gdk_pixbuf__wbmp_image_load(FILE * f)
pb = State->pixbuf; pb = State->pixbuf;
gdk_pixbuf__bmp_image_stop_load(State); gdk_pixbuf__wbmp_image_stop_load(State);
return pb; return pb;
} }
...@@ -115,9 +115,9 @@ gdk_pixbuf__wbmp_image_begin_load(ModulePreparedNotifyFunc prepared_func, ...@@ -115,9 +115,9 @@ gdk_pixbuf__wbmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
ModuleAnimationDoneNotifyFunc ModuleAnimationDoneNotifyFunc
anim_done_func, gpointer user_data) anim_done_func, gpointer user_data)
{ {
struct bmp_progressive_state *context; struct wbmp_progressive_state *context;
context = g_new0(struct bmp_progressive_state, 1); context = g_new0(struct wbmp_progressive_state, 1);
context->prepared_func = prepared_func; context->prepared_func = prepared_func;
context->updated_func = updated_func; context->updated_func = updated_func;
context->user_data = user_data; context->user_data = user_data;
...@@ -136,8 +136,8 @@ gdk_pixbuf__wbmp_image_begin_load(ModulePreparedNotifyFunc prepared_func, ...@@ -136,8 +136,8 @@ gdk_pixbuf__wbmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
*/ */
void gdk_pixbuf__wbmp_image_stop_load(gpointer data) void gdk_pixbuf__wbmp_image_stop_load(gpointer data)
{ {
struct bmp_progressive_state *context = struct wbmp_progressive_state *context =
(struct bmp_progressive_state *) data; (struct wbmp_progressive_state *) data;
g_return_if_fail(context != NULL); g_return_if_fail(context != NULL);
if (context->pixbuf) if (context->pixbuf)
...@@ -147,7 +147,7 @@ void gdk_pixbuf__wbmp_image_stop_load(gpointer data) ...@@ -147,7 +147,7 @@ void gdk_pixbuf__wbmp_image_stop_load(gpointer data)
} }
static gboolean static gboolean
getin(struct bmp_progressive_state *context, const guchar **buf, guint *buf_size, guchar *ptr, int datum_size) getin(struct wbmp_progressive_state *context, guchar **buf, guint *buf_size, guchar *ptr, int datum_size)
{ {
int last_num, buf_num; int last_num, buf_num;
...@@ -165,10 +165,12 @@ getin(struct bmp_progressive_state *context, const guchar **buf, guint *buf_size ...@@ -165,10 +165,12 @@ getin(struct bmp_progressive_state *context, const guchar **buf, guint *buf_size
memmove(context->last_buf, context->last_buf+last_num, context->last_len); memmove(context->last_buf, context->last_buf+last_num, context->last_len);
*buf_size -= buf_num; *buf_size -= buf_num;
*buf += buf_num; *buf += buf_num;
return TRUE;
} }
static gboolean static gboolean
save_rest(struct bmp_progressive_state *context, const guchar *buf, guint buf_size) save_rest(struct wbmp_progressive_state *context, const guchar *buf, guint buf_size)
{ {
if(buf_size > (sizeof(context->last_buf) - context->last_len)) if(buf_size > (sizeof(context->last_buf) - context->last_len))
return FALSE; return FALSE;
...@@ -180,11 +182,10 @@ save_rest(struct bmp_progressive_state *context, const guchar *buf, guint buf_si ...@@ -180,11 +182,10 @@ save_rest(struct bmp_progressive_state *context, const guchar *buf, guint buf_si
} }
static gboolean static gboolean
get_mbi(struct bmp_progressive_state *context, const guchar **buf, guint *buf_size, int *val) get_mbi(struct wbmp_progressive_state *context, guchar **buf, guint *buf_size, int *val)
{ {
guchar intbuf[16]; guchar intbuf[16];
int i, n; int i, n;
guchar last;
gboolean rv; gboolean rv;
*val = 0; *val = 0;
...@@ -221,8 +222,8 @@ get_mbi(struct bmp_progressive_state *context, const guchar **buf, guint *buf_si ...@@ -221,8 +222,8 @@ get_mbi(struct bmp_progressive_state *context, const guchar **buf, guint *buf_si
gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf, gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf,
guint size) guint size)
{ {
struct bmp_progressive_state *context = struct wbmp_progressive_state *context =
(struct bmp_progressive_state *) data; (struct wbmp_progressive_state *) data;
gboolean bv; gboolean bv;
do do
...@@ -273,7 +274,7 @@ gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf, ...@@ -273,7 +274,7 @@ gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf,
first_row = context->cury; first_row = context->cury;
for( ; context->cury < context->height; context->cury++, context->curx = 0) for( ; context->cury < context->height; context->cury++, context->curx = 0)
{ {
for( ; context->curx < context->width, context->curx += 8) for( ; context->curx < context->width; context->curx += 8)
{ {
guchar byte; guchar byte;
guchar *ptr; guchar *ptr;
......
...@@ -399,7 +399,7 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader, ...@@ -399,7 +399,7 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader,
if (priv->header_buf_offset >= LOADER_HEADER_SIZE) if (priv->header_buf_offset >= LOADER_HEADER_SIZE)
{ {
if (gdk_pixbuf_loader_load_module (loader) == 0) if (gdk_pixbuf_loader_load_module (loader, NULL) == 0)
return 0; return 0;
} }
...@@ -563,7 +563,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader) ...@@ -563,7 +563,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader)
/* We have less the 128 bytes in the image. Flush it, and keep going. */ /* We have less the 128 bytes in the image. Flush it, and keep going. */
if (priv->image_module == NULL) if (priv->image_module == NULL)
gdk_pixbuf_loader_load_module (loader); gdk_pixbuf_loader_load_module (loader, NULL);
if (priv->image_module && priv->image_module->stop_load) if (priv->image_module && priv->image_module->stop_load)
priv->image_module->stop_load (priv->context); priv->image_module->stop_load (priv->context);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment