From 724059ccdf8444b5f199606ef4b27d1d351f0875 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Jul 2002 23:54:50 +0000 Subject: [PATCH] Correct computation of image height. (OneLine): Correct update * io-ico.c (DecodeHeader): Correct computation of image height. (OneLine): Correct update notification. --- gdk-pixbuf/ChangeLog | 3 +++ gdk-pixbuf/io-ico.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index b0d6ab4b4b..e180fd5e15 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,8 @@ 2002-07-07 Matthias Clasen + * io-ico.c (DecodeHeader): Correct computation of image height. + (OneLine): Correct update notification. + Load-at-size functionality (#53726): * gdk-pixbuf-io.h (ModuleSizeFunc): New. diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index 1a1de441e4..d39f4c92ed 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -342,7 +342,7 @@ static void DecodeHeader(guchar *Data, gint Bytes, return; } State->Header.height = - (int)(BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) + (BIH[8])/2; + (int)((BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) + (BIH[8]))/2; /* /2 because the BIH height includes the transparency mask */ if (State->Header.height == 0) { g_set_error (error, @@ -797,9 +797,9 @@ static void OneLine(struct ico_progressive_state *context) if (context->updated_func != NULL) { (*context->updated_func) (context->pixbuf, 0, - context->Lines, + context->Lines % context->Header.height, context->Header.width, - context->Header.height, + 1, context->user_data); }