From 746d1cd9d4f5c5f74f65c490274889ccbaa54cd1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 11 Mar 2003 23:02:39 +0000 Subject: [PATCH] Calculate LineWidth for 16bpp from width, like for the other depths. 2003-03-11 Matthias Clasen * io-ico.c (DecodeHeader): Calculate LineWidth for 16bpp from width, like for the other depths. (noticed by Marijn Ros) --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/io-ico.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7fae7b9a91..4646841618 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2003-03-11 Matthias Clasen + + * io-ico.c (DecodeHeader): Calculate LineWidth for 16bpp from + width, like for the other depths. (noticed by Marijn Ros) + 2003-03-08 Matthias Clasen Bug #107664 continued: diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index c81d0d3bfb..a83fce83c0 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -370,7 +370,7 @@ static void DecodeHeader(guchar *Data, gint Bytes, else if (State->Type == 24) State->LineWidth = State->Header.width * 3; else if (State->Type == 16) - State->LineWidth = State->Header.height * 2; + State->LineWidth = State->Header.width * 2; else if (State->Type == 8) State->LineWidth = State->Header.width * 1; else if (State->Type == 4)