[Rawstudio-commit] r4137 - trunk/src

Klaus Post klauspost at gmail.com
Fri Feb 17 18:14:05 CET 2012


Author: post
Date: 2012-02-17 18:14:05 +0100 (Fri, 17 Feb 2012)
New Revision: 4137

Modified:
   trunk/src/rs-dir-selector.c
   trunk/src/rs-histogram.c
   trunk/src/rs-pixbuf.c
   trunk/src/rs-store.c
Log:
Remove unused variables.

Modified: trunk/src/rs-dir-selector.c
===================================================================
--- trunk/src/rs-dir-selector.c	2012-02-17 17:12:48 UTC (rev 4136)
+++ trunk/src/rs-dir-selector.c	2012-02-17 17:14:05 UTC (rev 4137)
@@ -56,11 +56,6 @@
 static void
 rs_dir_selector_class_init(RSDirSelectorClass *klass)
 {
-	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
-	widget_class = GTK_WIDGET_CLASS(klass);
-	object_class = GTK_OBJECT_CLASS(klass);
-
 	signals[DIRECTORY_ACTIVATED_SIGNAL] = g_signal_new ("directory-activated",
 		G_TYPE_FROM_CLASS (klass),
 		G_SIGNAL_RUN_FIRST,

Modified: trunk/src/rs-histogram.c
===================================================================
--- trunk/src/rs-histogram.c	2012-02-17 17:12:48 UTC (rev 4136)
+++ trunk/src/rs-histogram.c	2012-02-17 17:14:05 UTC (rev 4137)
@@ -56,9 +56,7 @@
 rs_histogram_widget_class_init(RSHistogramWidgetClass *klass)
 {
 	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
 	widget_class = GTK_WIDGET_CLASS(klass);
-	object_class = GTK_OBJECT_CLASS(klass);
 	widget_class->expose_event = expose;
 }
 

Modified: trunk/src/rs-pixbuf.c
===================================================================
--- trunk/src/rs-pixbuf.c	2012-02-17 17:12:48 UTC (rev 4136)
+++ trunk/src/rs-pixbuf.c	2012-02-17 17:14:05 UTC (rev 4137)
@@ -22,7 +22,6 @@
 void
 rs_pixbuf_draw_hline(GdkPixbuf *pixbuf, guint x, guint y, guint length, guint R, guint G, guint B, guint A)
 {
-	gint width, height;
 	guint rowstride;
 	guchar *pixels;
 	gint channels;
@@ -30,8 +29,6 @@
 
 	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
 	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
 	channels = gdk_pixbuf_get_n_channels (pixbuf);
 
 	for (i = x*channels; i < (length+x)*channels; i+=channels)
@@ -47,7 +44,6 @@
 void
 rs_pixbuf_draw_vline(GdkPixbuf *pixbuf, guint x, guint y, guint length, guint R, guint G, guint B, guint A)
 {
-	gint width, height;
 	guint rowstride;
 	guchar *pixels;
 	gint channels;
@@ -55,8 +51,6 @@
 
 	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
 	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
 	channels = gdk_pixbuf_get_n_channels (pixbuf);
 
 	for (i = y; i < y+length; i++)

Modified: trunk/src/rs-store.c
===================================================================
--- trunk/src/rs-store.c	2012-02-17 17:12:48 UTC (rev 4136)
+++ trunk/src/rs-store.c	2012-02-17 17:14:05 UTC (rev 4137)
@@ -183,10 +183,6 @@
 static void
 rs_store_class_init(RSStoreClass *klass)
 {
-	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
-	widget_class = GTK_WIDGET_CLASS(klass);
-	object_class = GTK_OBJECT_CLASS(klass);
 
 	signals[THUMB_ACTIVATED_SIGNAL] = g_signal_new ("thumb-activated",
 		G_TYPE_FROM_CLASS (klass),
@@ -382,7 +378,7 @@
 		if (! ((event->state & GDK_CONTROL_MASK) || ((event->state & GDK_SHIFT_MASK))))
 		{
 			event->button = 1;
-			GdkEvent *copy = gdk_event_copy(event);
+			GdkEvent *copy = gdk_event_copy((GdkEvent*)event);
 			gdk_event_put(copy);
 			GTK_CATCHUP();
 			gdk_event_free(copy);
@@ -1732,14 +1728,11 @@
 gchar *
 rs_store_get_name(RSStore *store, GtkTreeIter *iter)
 {
-	GtkTreeModel *model;
 	gchar *fullname = NULL;
 
 	g_assert(RS_IS_STORE(store));
 	g_assert(iter != NULL);
 
-	model = gtk_icon_view_get_model (GTK_ICON_VIEW(store->current_iconview));
-
 	gtk_tree_model_get(GTK_TREE_MODEL(store->store), iter, FULLNAME_COLUMN, &fullname, -1);
 
 	return(fullname);
@@ -2114,21 +2107,10 @@
 	cairo_surface_destroy(surface);
 
 #else
-
-	guint rowstride;
-	guchar *pixels;
-	gint channels;
-	gint new_width, new_height;
 	GdkPixbuf *pixbuf_scaled;
 
 	width -= 6;
 	height -= 6;
-	
-	rowstride = gdk_pixbuf_get_rowstride (new_pixbuf);
-	pixels = gdk_pixbuf_get_pixels (new_pixbuf);
-	new_width = gdk_pixbuf_get_width (new_pixbuf);
-	new_height = gdk_pixbuf_get_height (new_pixbuf);
-	channels = gdk_pixbuf_get_n_channels (new_pixbuf);
 
 	// draw horizontal lines
 	rs_pixbuf_draw_hline(new_pixbuf, 0, 0, width+2, 0x00, 0x00, 0x00, 0xFF);




More information about the Rawstudio-commit mailing list