[Rawstudio-commit] r2050 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 02:27:13 +0200 (Mon, 29 Sep 2008)
New Revision: 2050

Modified:
   trunk/src/rawstudio.c
   trunk/src/rawstudio.h
Log:
Removed rs_reset().

Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c	2008-09-29 00:25:29 UTC (rev 2049)
+++ trunk/src/rawstudio.c	2008-09-29 00:27:13 UTC (rev 2050)
@@ -140,15 +140,6 @@
 }
 
 void
-rs_reset(RS_BLOB *rs)
-{
-	gint c;
-	for(c=0;c<3;c++)
-		rs_settings_reset(rs->settings[c], MASK_ALL);
-	return;
-}
-
-void
 rs_free(RS_BLOB *rs)
 {
 	if (rs->photo)
@@ -208,6 +199,7 @@
 void
 rs_set_photo(RS_BLOB *rs, RS_PHOTO *photo)
 {
+	gint c;
 	g_assert(rs != NULL);
 
 	/* Unref old photo if any */
@@ -215,7 +207,8 @@
 		g_object_unref(rs->photo);
 	rs->photo = NULL;
 
-	rs_reset(rs);
+	for(c=0;c<3;c++)
+		rs_settings_reset(rs->settings[c], MASK_ALL);
 
 	/* Apply settings from photo */
 	rs_settings_double_to_rs_settings(photo->settings[0], rs->settings[0], MASK_ALL);

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-29 00:25:29 UTC (rev 2049)
+++ trunk/src/rawstudio.h	2008-09-29 00:27:13 UTC (rev 2050)
@@ -173,7 +173,6 @@
 	struct _rs_filetype *next;
 } RS_FILETYPE;
 
-void rs_reset(RS_BLOB *rs);
 void rs_settings_to_rs_settings_double(RS_SETTINGS *rs_settings, RS_SETTINGS_DOUBLE *rs_settings_double);
 void rs_settings_double_to_rs_settings(RS_SETTINGS_DOUBLE *rs_settings_double, RS_SETTINGS *rs_settings, gint mask);
 void rs_settings_reset(RS_SETTINGS *rss, guint mask);