f-spot r4099 - in trunk: . src

[rubenv svn gnome org]

Author: rubenv
Date: Wed Jun 25 21:10:09 2008
New Revision: 4099
URL: http://svn.gnome.org/viewvc/f-spot?rev=4099&view=rev

Log:
2008-06-25  Ruben Vermeersch  <ruben savanne be>

	* ColorAdjustment.cs: Fix a small regression where an input profile might
	be missed. This is fixed in a nasty way, but fixed in the clean way in my
	(refactored) tree.


Modified:
   trunk/ChangeLog
   trunk/src/ColorAdjustment.cs

Modified: trunk/src/ColorAdjustment.cs
==============================================================================
--- trunk/src/ColorAdjustment.cs	(original)
+++ trunk/src/ColorAdjustment.cs	Wed Jun 25 21:10:09 2008
@@ -31,14 +31,9 @@
 		// already have a copy in memory) avoids doing a duplicate load.
 		public Gdk.Pixbuf Image {
 			get {
-				if (image == null) {
-					using (ImageFile img = ImageFile.Create (photo.DefaultVersionUri)) {
+				if (image == null)
+					using (ImageFile img = ImageFile.Create (photo.DefaultVersionUri))
 						image = img.Load ();
-
-						if (image_profile == null)
-							image_profile = img.GetProfile ();
-					}
-				}
 				return image;
 			}
 			set { image = value; }
@@ -61,6 +56,10 @@
 			bool create_version = photo.DefaultVersion.IsProtected;
 
 			if (image_profile == null)
+				using (ImageFile img = ImageFile.Create (photo.DefaultVersionUri))
+					image_profile = img.GetProfile ();
+
+			if (image_profile == null)
 				image_profile = Cms.Profile.CreateStandardRgb ();
 
 			if (destination_profile == null)