Author: post
Date: 2011-02-19 18:50:20 +0100 (Sat, 19 Feb 2011)
New Revision: 3820
Modified:
trunk/src/rs-toolbox.c
Log:
Always load embedded profile if present.
Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c 2011-02-19 13:54:16 UTC (rev 3819)
+++ trunk/src/rs-toolbox.c 2011-02-19 17:50:20 UTC (rev 3820)
@@ -1115,22 +1115,25 @@
toolbox->last_camera.unique_id =
rs_profile_camera_find(photo->metadata->make_ascii,
photo->metadata->model_ascii);
}
- if (toolbox->last_camera.unique_id)
+ if (embedded_present)
+ filter =
rs_dcp_factory_get_compatible_as_model(factory, "Embedded");
+ else if (toolbox->last_camera.unique_id)
filter =
rs_dcp_factory_get_compatible_as_model(factory, toolbox->last_camera.unique_id);
else
filter =
rs_dcp_factory_get_compatible_as_model(factory, photo->metadata->model_ascii);
rs_profile_selector_set_model_filter(toolbox->selector, filter);
}
-
+
/* Find current profile and mark it active */
if (photo)
{
RSDcpFile *dcp_profile = rs_photo_get_dcp_profile(photo);
- if (dcp_profile)
+ if (embedded_present)
+
gtk_combo_box_set_active(GTK_COMBO_BOX(toolbox->selector), 0);
+ else if (dcp_profile)
rs_profile_selector_select_profile(toolbox->selector,
dcp_profile);
- else if (embedded_present)
-
gtk_combo_box_set_active(GTK_COMBO_BOX(toolbox->selector), 0);
+
/* FIXME: support ICC profiles too */
photo_spatial_changed(toolbox->photo, toolbox);
}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
