comparison src/image-overlay.c @ 865:8d0c91a0f461

do not read keywords and comment between exif_read_fd and exif_free_fd calls (fd->exif does not have reference counting)

864:f40509d56fe3

	guint pos, prev;
	guint last;
	gchar *name, *data;
	GString *new;
	gchar *ret;
	ExifData *exif;

	if (!str || !*str) return g_strdup("");

	new = g_string_new(str);

	exif = exif_read_fd(imd->image_fd);
	prev = 0;
	last = FALSE;

	while (TRUE)
		{

			{
			comment_read(imd->image_fd, NULL, &data);
			}
		else
			{
			data = g_strdup(g_hash_table_lookup(vars, name));
			if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
			if (!data && exif)
				data = exif_get_data_as_text(exif, name);
			}
		if (data && *data && limit > 0 && strlen(data) > limit + 3)
			{
			gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
			g_free(data);

		last = data ? TRUE : last;
		g_free(name);
		g_free(data);
		}

	exif_free_fd(imd->image_fd, exif);
	/* search and destroy empty lines */
	end = new->str;
	while ((start = strchr(end, '\n')))
		{
		end = start;

865:8d0c91a0f461

	guint pos, prev;
	guint last;
	gchar *name, *data;
	GString *new;
	gchar *ret;

	if (!str || !*str) return g_strdup("");

	new = g_string_new(str);

	prev = 0;
	last = FALSE;

	while (TRUE)
		{

			{
			comment_read(imd->image_fd, NULL, &data);
			}
		else
			{
			/* 
			   keywords and comment can't be read between exif_read_fd and exif_free_fd calls
			   because fd->exif does not count references
			   on the other hand, it is OK to call it in the loop because it is cached
			*/
			   
			ExifData *exif;
			exif = exif_read_fd(imd->image_fd);

			data = g_strdup(g_hash_table_lookup(vars, name));
			if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
			if (!data && exif)
				data = exif_get_data_as_text(exif, name);
			exif_free_fd(imd->image_fd, exif);
			}
		if (data && *data && limit > 0 && strlen(data) > limit + 3)
			{
			gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
			g_free(data);

		last = data ? TRUE : last;
		g_free(name);
		g_free(data);
		}

	/* search and destroy empty lines */
	end = new->str;
	while ((start = strchr(end, '\n')))
		{
		end = start;