Remove unused pixels and rowstride variables.

2002-01-07  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
	unused pixels and rowstride variables.
	(gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.

diff --git a/ChangeLog b/ChangeLog
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1af13f439d0689715dc0bae5a022c138817ef08c..d2f943769893b4b25ff19c8a8301b2847a897889 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-01-07  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Remove
+       unused pixels and rowstride variables.
+       (gtk_cell_renderer_pixbuf_get_size): Check for non-NULL width.
+
 Mon Jan  7 08:48:23 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 26bf3a1c40d3772761e168c12becb49d965d403b..8923410481ae7db4433a45d421c4acf421d3fb32 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -288,8 +288,6 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
 {
   GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
   GdkPixbuf *pixbuf;
-  guchar *pixels;
-  gint rowstride;
   GdkRectangle pix_rect;
   GdkRectangle draw_rect;
 
@@ -307,9 +305,6 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
   if (!pixbuf)
     return;
 
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-
   gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
                                     &pix_rect.x,
                                     &pix_rect.y,