From 8ab98f3a58b4e56e3f4ecb49d99a2bf1e21fa91c Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 7 Jan 2002 08:02:23 +0000 Subject: [PATCH] Remove unused pixels and rowstride variables. 2002-01-07 Anders Carlsson * 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. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcellrendererpixbuf.c | 5 ----- 8 files changed, 42 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1af13f439d..d2f9437698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * 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 1af13f439d..d2f9437698 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-01-07 Anders Carlsson + + * 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 * gtk/gtkdnd.c (gtk_drag_find_widget): don't forget to offset diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index 26bf3a1c40..8923410481 100644 --- 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,