diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 53c54dbd7..142bc02c6 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 31 12:38:50 2000 Owen Taylor + + * gdk-pixbuf/pixops/pixops.c (scale_line): Fix from Peter + Wainwright to fix 4a => 4a scaling. + 2000-01-29 Mark Crichton * gdk-pixbuf-config: Oh dear, we weren't Telsa/Alan proof... diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index deae075fe..1030e1ffd 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -54,7 +54,7 @@ libexec_LTLIBRARIES = \ $(PNM_LIB) \ $(BMP_LIB) -noinst_PROGRAMS = testpixbuf testpixbuf-drawable testanimation testpixbuf-scale +noinst_PROGRAMS = testpixbuf testpixbuf-drawable testanimation testpixbuf-scale testpixbuf-foo DEPS = libgdk_pixbuf.la INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ @@ -74,6 +74,7 @@ else testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS) testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS) +testpixbuf_foo_LDADD = $(LDADDS) $(GNOME_LIBS) testanimation_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule endif diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c index f0e28f1a2..5834a26a3 100644 --- a/gdk-pixbuf/pixops/pixops.c +++ b/gdk-pixbuf/pixops/pixops.c @@ -711,9 +711,9 @@ scale_line (int *weights, int n_x, int n_y, unsigned int ta; ta = q[3] * line_weights[j]; - r = ta * q[0]; - g = ta * q[1]; - b = ta * q[2]; + r += ta * q[0]; + g += ta * q[1]; + b += ta * q[2]; a += ta; q += src_channels;