Correct computation of image height. (OneLine): Correct update

* io-ico.c (DecodeHeader): Correct computation of image height.
	(OneLine): Correct update notification.
This commit is contained in:
Matthias Clasen 2002-07-06 23:54:50 +00:00
parent e4ab381018
commit 724059ccdf
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2002-07-07 Matthias Clasen <maclas@gmx.de>
* io-ico.c (DecodeHeader): Correct computation of image height.
(OneLine): Correct update notification.
Load-at-size functionality (#53726):
* gdk-pixbuf-io.h (ModuleSizeFunc): New.

View File

@ -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);
}