Bumped version number to 0.5.0.

2000-01-22  Federico Mena Quintero  <federico@helixcode.com>

	* configure.in: Bumped version number to 0.5.0.

	* gdk-pixbuf/pixops/timescale.c (dump_array): Removed unused variable.
	(main): Return 0.

	* gdk-pixbuf/pixops/pixops.c (pixops_composite_color_nearest): Put
	parentheses around + in a shift to remove a compiler warning.
	(pixops_process): Likewise.

	Patch from Ross Golder <rossigee@bigfoot.com> to create an RPM
	specfile:

	* configure.in: Added gdk-pixbuf.spec to AC_OUTPUT.

	* Makefile.am (EXTRA_DIST): Added gdk-pixbuf.spec.in

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 66e2bf74f78b945dd05632f5e9b5b0072ff353e2..ab5cf9b68a9f5433abc1f6220d658d01bd803c36 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,21 @@
+2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
+
+       * configure.in: Bumped version number to 0.5.0.
+
+       * gdk-pixbuf/pixops/timescale.c (dump_array): Removed unused variable.
+       (main): Return 0.
+
+       * gdk-pixbuf/pixops/pixops.c (pixops_composite_color_nearest): Put
+       parentheses around + in a shift to remove a compiler warning.
+       (pixops_process): Likewise.
+
+       Patch from Ross Golder <rossigee@bigfoot.com> to create an RPM
+       specfile:
+
+       * configure.in: Added gdk-pixbuf.spec to AC_OUTPUT.
+
+       * Makefile.am (EXTRA_DIST): Added gdk-pixbuf.spec.in
+
 2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
 
        * gdk-pixbuf/gnome-canvas-pixbuf.c (PixbufPrivate): Removed the
@@ -121,6 +139,7 @@
        Return 0 if gdk_pixbuf_load_loader_module returns FALSE.
 
 2000-01-05 Elliot Lee <sopwith@redhat.com>
+
        * gdk-pixbuf/pixops/Makefile.am: Link with -lm (to get 'ceil' function)
 
 2000-01-05  Owen Taylor  <otaylor@redhat.com>
@@ -603,6 +622,7 @@ Mon Nov 15 17:18:28 1999  George Lebl <jirka@5z.com>
        * src/Makefile.am: Build testpixbuf-drawable.
 
 1999-11-12  Cody Russell  <bratsche@dfw.net>
+
        * src/gdk-pixbuf-drawable.c: Merged in Michael Zucchi's changes.
 
 1999-11-10  Federico Mena Quintero  <federico@redhat.com>

diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
index cda92da8fbcb7222f6da3caf7ac5fff5e106981c..f0e28f1a231cea0cb7e659262df9520a7e8bd57d 100644 (file)
--- a/gdk-pixbuf/pixops/pixops.c
+++ b/gdk-pixbuf/pixops/pixops.c
@@ -278,7 +278,7 @@ pixops_composite_color_nearest (art_u8        *dest_buf,
          else
            a0 = overall_alpha;
 
-         if ((j + check_x >> check_shift) & 1)
+         if (((j + check_x) >> check_shift) & 1)
            {
              dest[0] = r2 + ((a0 * ((int)p[0] - r2) + 0xff) >> 8);
              dest[1] = g2 + ((a0 * ((int)p[1] - g2) + 0xff) >> 8);
@@ -933,7 +933,7 @@ pixops_process (art_u8         *dest_buf,
   int dest_x;
   int scaled_x_offset = floor (filter->x_offset * (1 << SCALE_SHIFT));
 
-  int run_end_index = ((src_width - filter->n_x + 1 << SCALE_SHIFT) - scaled_x_offset - 1) / x_step + 1 - render_x0;
+  int run_end_index = (((src_width - filter->n_x + 1) << SCALE_SHIFT) - scaled_x_offset - 1) / x_step + 1 - render_x0;
   int check_shift = check_size ? get_check_shift (check_size) : 0;
 
   y = render_y0 * y_step + floor (filter->y_offset * (1 << SCALE_SHIFT));

diff --git a/gdk-pixbuf/pixops/timescale.c b/gdk-pixbuf/pixops/timescale.c
index 0db35c123ecf4db6dd527d0da8d7005bfbde809e..d0ea25748783e240000d3631af4f80f7dc7d422e 100644 (file)
--- a/gdk-pixbuf/pixops/timescale.c
+++ b/gdk-pixbuf/pixops/timescale.c
@@ -48,7 +48,7 @@ init_array (double times[3][3][4])
 void
 dump_array (double times[3][3][4])
 {
-  int i, j, k;
+  int i, j;
   
   printf("        3\t4\t4a\n");
   for (i=0; i<3; i++)
@@ -228,4 +228,5 @@ int main (int argc, char **argv)
 
   printf ("COMPOSITE_COLOR\n===============\n\n");
   dump_array (composite_color_times);
+  return 0;
 }