[Rawstudio-commit] r3092 - branches/rawstudio-ng-color/src

[Anders Brander]

Author: abrander
Date: 2010-01-27 15:22:16 +0100 (Wed, 27 Jan 2010)
New Revision: 3092

Modified:
   branches/rawstudio-ng-color/src/rs-cache.c
   branches/rawstudio-ng-color/src/rs-camera-db.c
   branches/rawstudio-ng-color/src/rs-toolbox.c
Log:
Updated src/ to use RSProfileFactory.

Modified: branches/rawstudio-ng-color/src/rs-cache.c
===================================================================
--- branches/rawstudio-ng-color/src/rs-cache.c  2010-01-27 14:20:39 UTC (rev 
3091)
+++ branches/rawstudio-ng-color/src/rs-cache.c  2010-01-27 14:22:16 UTC (rev 
3092)
@@ -378,8 +378,8 @@
                else if ((!xmlStrcmp(cur->name, BAD_CAST "dcp-profile")))
                {
                        val = xmlNodeListGetString(doc, cur->xmlChildrenNode, 
1);
-                       RSDcpFactory *factory = rs_dcp_factory_new_default();
-                       RSDcpFile *dcp = rs_dcp_factory_find_from_id(factory, 
(gchar *) val);
+                       RSProfileFactory *factory = 
rs_profile_factory_new_default();
+                       RSDcpFile *dcp = 
rs_profile_factory_find_from_id(factory, (gchar *) val);
                        if (dcp)
                                rs_photo_set_dcp_profile(photo, dcp);
                        xmlFree(val);

Modified: branches/rawstudio-ng-color/src/rs-camera-db.c
===================================================================
--- branches/rawstudio-ng-color/src/rs-camera-db.c      2010-01-27 14:20:39 UTC 
(rev 3091)
+++ branches/rawstudio-ng-color/src/rs-camera-db.c      2010-01-27 14:22:16 UTC 
(rev 3092)
@@ -276,7 +276,7 @@
        xmlNodePtr cur;
        xmlNodePtr entry = NULL;
        xmlChar *val;
-       RSDcpFactory *dcp_factory = rs_dcp_factory_new_default();
+       RSProfileFactory *profile_factory = rs_profile_factory_new_default();
 
        doc = xmlParseFile(camera_db->path);
        if (!doc)
@@ -304,7 +304,7 @@
                                        else if ((!xmlStrcmp(entry->name, 
BAD_CAST "model")))
                                                
gtk_list_store_set(camera_db->cameras, &iter, COLUMN_MODEL, val, -1);
                                        else if ((!xmlStrcmp(entry->name, 
BAD_CAST "dcp-profile")))
-                                               
gtk_list_store_set(camera_db->cameras, &iter, COLUMN_PROFILE, 
rs_dcp_factory_find_from_id(dcp_factory, (gchar *) val), -1);
+                                               
gtk_list_store_set(camera_db->cameras, &iter, COLUMN_PROFILE, 
rs_profile_factory_find_from_id(profile_factory, (gchar *) val), -1);
                                        xmlFree(val);
                                        
                                        if ((!xmlStrcmp(entry->name, BAD_CAST 
"settings")))
@@ -371,9 +371,8 @@
                        {
                                if (RS_IS_DCP_FILE(profile))
                                {
-                                       gchar* dcp_id = 
rs_dcp_get_id(RS_DCP_FILE(profile));
+                                       const gchar* dcp_id = 
rs_dcp_get_id(RS_DCP_FILE(profile));
                                        xmlTextWriterWriteFormatElement(writer, 
BAD_CAST "dcp-profile", "%s", dcp_id);
-                                       g_free(dcp_id);
                                }
                                /* FIXME: Add support for ICC profiles */
                        }

Modified: branches/rawstudio-ng-color/src/rs-toolbox.c
===================================================================
--- branches/rawstudio-ng-color/src/rs-toolbox.c        2010-01-27 14:20:39 UTC 
(rev 3091)
+++ branches/rawstudio-ng-color/src/rs-toolbox.c        2010-01-27 14:22:16 UTC 
(rev 3092)
@@ -947,8 +947,8 @@
        GList *dcp_profiles = NULL;
        if (photo && photo->metadata)
        {
-               RSDcpFactory *factory = rs_dcp_factory_new_default();
-               dcp_profiles = rs_dcp_factory_get_compatible(factory, 
photo->metadata->make_ascii, photo->metadata->model_ascii);
+               RSProfileFactory *factory = rs_profile_factory_new_default();
+               dcp_profiles = rs_profile_factory_get_compatible(factory, 
photo->metadata->make_ascii, photo->metadata->model_ascii);
        }
        rs_profile_selector_set_profiles_steal(toolbox->selector, dcp_profiles);
        


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit