X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Fimage-overlay.c;h=35451c56613d09d81e4416b2e177693dcb6283c8;hp=9a8b706be4f057ec2eacf17aa1bdc51455c15b9b;hb=db38d12f83128e9890ce2d2c7acc5ad62062bc7e;hpb=e436ea53511e1dadab981af18b237fee83fde39b

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 9a8b706b..35451c56 100644
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -44,7 +44,7 @@ struct _OverlayStateData {
 	OsdShowFlags show;
 
 	gint ovl_info;
-	
+
 	gint x;
 	gint y;
 
@@ -226,13 +226,13 @@ static gchar *keywords_to_string(FileData *fd)
 			{
 			gchar *kw = work->data;
 			work = work->next;
-			
+
 			if (!kw) continue;
 			if (!kwstr)
 				kwstr = g_string_new("");
 			else
 				g_string_append(kwstr, ", ");
-			
+
 			g_string_append(kwstr, kw);
 			}
 		string_list_free(keywords);
@@ -305,7 +305,7 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
 
 		if (extrapos)
 			extra = g_strndup(extrapos, end - extrapos);
-					
+
 		name = g_strndup(start+1, (trunc ? trunc : end)-start-1);
 		pos = start - new->str;
 		data = NULL;
@@ -324,14 +324,14 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
 			if (!data)
 				data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
 			}
-	
+
 		if (data && *data && limit > 0 && strlen(data) > limit + 3)
 			{
 			gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
 			g_free(data);
 			data = new_data;
 			}
-	
+
 		if (data)
 			{
 			/* Since we use pango markup to display, we need to escape here */
@@ -366,7 +366,7 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
 				gchar *right = extra;
 				gchar *p;
 				guint len = strlen(extra);
-				
+
 				/* Search for left and right parts and unescape characters */
 				for (p = extra; *p; p++, len--)
 					if (p[0] == '\\')
@@ -537,20 +537,20 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
 				t = 1;
 				n = 1;
 				}
-	
+
 			if (n < 1) n = 1;
 			if (t < 1) t = 1;
-	
+
 			osd_template_insert(vars, "collection", NULL, OSDT_NONE);
 			}
-		
+
 		osd_template_insert(vars, "number", g_strdup_printf("%d", n), OSDT_NO_DUP);
 		osd_template_insert(vars, "total", g_strdup_printf("%d", t), OSDT_NO_DUP);
 		osd_template_insert(vars, "name", (gchar *) name, OSDT_NONE);
 		osd_template_insert(vars, "date", imd->image_fd ? ((gchar *) text_from_time(imd->image_fd->date)) : "", OSDT_NONE);
 		osd_template_insert(vars, "size", imd->image_fd ? (text_from_size_abrev(imd->image_fd->size)) : g_strdup(""), OSDT_FREE);
 		osd_template_insert(vars, "zoom", image_zoom_get_as_text(imd), OSDT_FREE);
-	
+
 		if (!imd->unknown)
 			{
 			gint w, h;
@@ -567,8 +567,8 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
 				{
 				image_get_image_size(imd, &w, &h);
 				}
-		
-			
+
+
 			osd_template_insert(vars, "width", g_strdup_printf("%d", w), OSDT_NO_DUP);
 	 		osd_template_insert(vars, "height", g_strdup_printf("%d", h), OSDT_NO_DUP);
 	 		osd_template_insert(vars, "res", g_strdup_printf("%d × %d", w, h), OSDT_FREE);
@@ -598,8 +598,8 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
 			with_hist = FALSE;
 			}
 		}
-	
-	
+
+
 	{
 		gint active_marks = 0;
 		gint mark;
@@ -885,7 +885,7 @@ static gboolean image_osd_update_cb(gpointer data)
 		{
 		if (osd->changed_states & IMAGE_STATE_IMAGE)
 			image_osd_icons_reset_time(osd);
-	
+
 		if (osd->changed_states & IMAGE_STATE_COLOR_ADJ)
 			{
 			osd->icon_time[IMAGE_OSD_COLOR] = IMAGE_OSD_DEFAULT_DURATION + 1;
@@ -1046,7 +1046,7 @@ static void image_osd_enable(ImageWindow *imd, OsdShowFlags show)
 		osd->show = OSD_SHOW_NOTHING;
 		osd->x = options->image_overlay.x;
 		osd->y = options->image_overlay.y;
-		
+
 		osd->histogram = histogram_new();
 
 		osd->destroy_id = g_signal_connect(G_OBJECT(imd->pr), "destroy",
@@ -1091,13 +1091,13 @@ void image_osd_copy_status(ImageWindow *src, ImageWindow *dest)
 {
 	Histogram *h_src, *h_dest;
 	image_osd_set(dest, image_osd_get(src));
-	
+
 	h_src = image_osd_get_histogram(src);
 	h_dest = image_osd_get_histogram(dest);
-	
+
 	h_dest->histogram_mode = h_src->histogram_mode;
 	h_dest->histogram_channel = h_src->histogram_channel;
-	
+
 }
 
 /* duration: