Revision: 1821
http://geeqie.svn.sourceforge.net/geeqie/?rev=1821&view=rev
Author: nadvornik
Date: 2009-08-23 13:37:15 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
fixed moving and maintenance of std. thumbnails
https://sourceforge.net/tracker/?func=detail&aid=2836224&group_id=222125&atid=1054680
Modified Paths:
--------------
trunk/src/thumb_standard.c
Modified: trunk/src/thumb_standard.c
===================================================================
--- trunk/src/thumb_standard.c 2009-08-22 21:58:49 UTC (rev 1820)
+++ trunk/src/thumb_standard.c 2009-08-23 13:37:15 UTC (rev 1821)
@@ -778,8 +778,9 @@
GdkPixbuf *pixbuf;
gboolean valid = FALSE;
- /* this function is called on success, so the pixbuf should not be a
fallback*/
- pixbuf = thumb_loader_std_get_pixbuf(tv->tl);
+ /* get the original thumbnail pixbuf (unrotated, with original options)
+ this is called from image_loader done callback, so tv->tl->il must
exist*/
+ pixbuf = image_loader_get_pixbuf(tv->tl->il);
if (pixbuf)
{
const gchar *uri;
@@ -820,8 +821,10 @@
}
}
}
-
- g_object_unref(pixbuf);
+ else
+ {
+ DEBUG_1("invalid image found in std cache: %s",
tv->path);
+ }
}
thumb_loader_std_thumb_file_validate_finish(tv, valid);
@@ -940,8 +943,9 @@
TMaintMove *tm = data;
GdkPixbuf *pixbuf;
- /* this function is called on success, so the pixbuf should not be a
fallback*/
- pixbuf = thumb_loader_std_get_pixbuf(tm->tl);
+ /* get the original thumbnail pixbuf (unrotated, with original options)
+ this is called from image_loader done callback, so tm->tl->il must
exist*/
+ pixbuf = image_loader_get_pixbuf(tm->tl->il);
if (pixbuf)
{
const gchar *uri;
@@ -984,7 +988,6 @@
DEBUG_1("thumb move unlink: %s", tm->thumb_path);
unlink_file(tm->thumb_path);
- g_object_unref(pixbuf);
}
thumb_std_maint_move_step(tm);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
