[UFRaw-CVS] ufraw ufraw_preview.c, 1.327, 1.328 ufraw_ui.h, 1.33, 1.34

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25984

Modified Files:
	ufraw_preview.c ufraw_ui.h 
Log Message:
Fix rotation-reset button to reset flipped images correctly.


Index: ufraw_ui.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ui.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ufraw_ui.h	27 Jan 2010 21:23:22 -0000	1.33
+++ ufraw_ui.h	31 Jan 2010 08:23:27 -0000	1.34
@@ -165,6 +165,7 @@
     int PageNumLightness;
     int PageNumCrop;
     int HisMinHeight;
+    int UnnormalizedOrientation;
     /* Original aspect ratio (0) or actual aspect ratio */
     float AspectRatio;
     /* The aspect ratio entry field */

Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- ufraw_preview.c	27 Jan 2010 21:23:22 -0000	1.327
+++ ufraw_preview.c	31 Jan 2010 08:23:27 -0000	1.328
@@ -3042,6 +3042,7 @@
     int oldFlip = CFG->orientation;
     ufraw_unnormalize_rotation(data->UF);
     CFG->rotationAngle = gtk_adjustment_get_value(data->RotationAdjustment);
+    CFG->orientation = data->UnnormalizedOrientation;
     ufraw_normalize_rotation(data->UF);
     int newFlip = CFG->orientation;
     int flip;
@@ -3132,6 +3133,7 @@
     data->FreezeDialog++;
     ufraw_unnormalize_rotation(data->UF);
     gtk_adjustment_set_value(data->RotationAdjustment, CFG->rotationAngle);
+    data->UnnormalizedOrientation = CFG->orientation;
     ufraw_normalize_rotation(data->UF);
     data->FreezeDialog--;
     CFG->orientation = oldOrientation;
@@ -5092,6 +5094,7 @@
 	G_CALLBACK(adjustment_update_rotation),
 	&data->ResetRotationAdjustment, _("Reset rotation angle"),
 	G_CALLBACK(adjustment_reset_rotation));
+    data->UnnormalizedOrientation = CFG->orientation;
     ufraw_normalize_rotation(data->UF);
     gtk_widget_set_sensitive(data->ResetRotationAdjustment,
 	    CFG->rotationAngle != 0 ||