Fixed compiler warnings. Fixed write to unallocated memory (row_ptr), and

1999-08-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* src/io-png.c (image_save): Fixed compiler warnings.  Fixed write
	to unallocated memory (row_ptr), and fixed its type as well.  Take
	into account the ArtPixbuf's rowstride when assigning the row
	pointers.

	* src/gdk-pixbuf.c: Fixup includes.

	* src/gdk-pixbuf-io.c: Likewise.

1 files changed, 15 insertions, 14 deletions

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index c786c1ddf..82acf793a 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -5,11 +5,14 @@
  *    Miguel de Icaza (miguel@gnu.org)
  *    Mark Crichton (crichton@gimp.org)
  */
+
 #include <config.h>
 #include <glib.h>
 #include <math.h>
 #include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_rgb_affine.h>
+#include <libart_lgpl/art_affine.h>
+#include <libart_lgpl/art_pixbuf.h>
+#include <libart_lgpl/art_rgb_pixbuf_affine.h>
 #include <libart_lgpl/art_alphagamma.h>
 #include "gdk-pixbuf.h"
 
@@ -25,7 +28,7 @@ void
 gdk_pixbuf_ref (GdkPixBuf *pixbuf)
 {
      g_return_if_fail (pixbuf != NULL);
-     
+
      pixbuf->ref_count++;
 }
 
@@ -34,7 +37,7 @@ gdk_pixbuf_unref (GdkPixBuf *pixbuf)
 {
     g_return_if_fail (pixbuf != NULL);
     g_return_if_fail (pixbuf->ref_count == 0);
-    
+
     pixbuf->ref_count--;
     if (pixbuf->ref_count)
 	gdk_pixbuf_destroy (pixbuf);
@@ -43,7 +46,6 @@ gdk_pixbuf_unref (GdkPixBuf *pixbuf)
 GdkPixBuf *
 gdk_pixbuf_scale (GdkPixBuf *pixbuf, gint w, gint h)
 {
-    GdkPixBuf *spb;
     art_u8 *pixels;
     gint rowstride;
     double affine[6];
@@ -53,8 +55,8 @@ gdk_pixbuf_scale (GdkPixBuf *pixbuf, gint w, gint h)
     alphagamma = NULL;
 
     affine[1] = affine[2] = affine[4] = affine[5] = 0;
-    
-    
+
+
     affine[0] = w / (double)(pixbuf->art_pixbuf->width);
     affine[3] = h / (double)(pixbuf->art_pixbuf->height);
 
@@ -62,15 +64,15 @@ gdk_pixbuf_scale (GdkPixBuf *pixbuf, gint w, gint h)
     rowstride = w * 3;
 
     pixels = art_alloc (h * rowstride);
-    art_rgb_pixbuf_affine( pixels, 0, 0, w, h, rowstride,
+    art_rgb_pixbuf_affine (pixels, 0, 0, w, h, rowstride,
 			   pixbuf->art_pixbuf,
 			   affine, ART_FILTER_NEAREST, alphagamma);
 
     if (pixbuf->art_pixbuf->has_alpha)
       /* should be rgba */
-      art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride); 
-    else 
-      art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride); 
+      art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
+    else
+      art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
 
     art_pixbuf_free (pixbuf->art_pixbuf);
     pixbuf->art_pixbuf = art_pixbuf;
@@ -81,7 +83,6 @@ gdk_pixbuf_scale (GdkPixBuf *pixbuf, gint w, gint h)
 GdkPixBuf *
 gdk_pixbuf_rotate (GdkPixBuf *pixbuf, gdouble angle)
 {
-     GdkPixBuf *rotate;
      art_u8 *pixels;
      gint rowstride, w, h;
      gdouble rad;
@@ -126,9 +127,9 @@ gdk_pixbuf_rotate (GdkPixBuf *pixbuf, gdouble angle)
 			    affine, ART_FILTER_NEAREST, alphagamma);
      if (pixbuf->art_pixbuf->has_alpha)
 	  /* should be rgba */
-	  art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride); 
-     else 
-	  art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride); 
+	  art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
+     else
+	  art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
 
      art_pixbuf_free (pixbuf->art_pixbuf);
      pixbuf->art_pixbuf = art_pixbuf;