Author: akv
Date: 2012-10-29 19:28:05 +0100 (Mon, 29 Oct 2012)
New Revision: 4306
Modified:
branches/4175-enfuse/
branches/4175-enfuse/plugins/dcp/dcp.c
branches/4175-enfuse/profiles/rawstudio-cameras.xml
branches/4175-enfuse/src/rs-toolbox.c
Log:
Merged with trunk.
Property changes on: branches/4175-enfuse
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4176-4298
+ /trunk:4176-4305
Modified: branches/4175-enfuse/plugins/dcp/dcp.c
===================================================================
--- branches/4175-enfuse/plugins/dcp/dcp.c 2012-10-29 16:09:11 UTC (rev
4305)
+++ branches/4175-enfuse/plugins/dcp/dcp.c 2012-10-29 18:28:05 UTC (rev
4306)
@@ -1207,11 +1207,11 @@
/* Curve */
if (dcp->read_out_curve)
{
- gfloat t1,t2,t3;
+ gfloat t1 = v,t2,t3;
if (dcp->tone_curve_lut)
{
- t1 = t2 = t3 = v;
- rgb_tone(&t1, &t1, &t3,
dcp->tone_curve_lut);
+ t2 = t3 = v;
+ rgb_tone(&t1, &t2, &t3,
dcp->tone_curve_lut);
}
int input = (int)(CLAMP(sqrtf(t1) * 256.0f,
0.0f, 255.9999f));
t->curve_input_values[input]++;
Modified: branches/4175-enfuse/profiles/rawstudio-cameras.xml
===================================================================
--- branches/4175-enfuse/profiles/rawstudio-cameras.xml 2012-10-29 16:09:11 UTC
(rev 4305)
+++ branches/4175-enfuse/profiles/rawstudio-cameras.xml 2012-10-29 18:28:05 UTC
(rev 4306)
@@ -1469,4 +1469,8 @@
<exif make="SONY" model="SLT-A77V"/>
</camera>
+ <camera unique_id="SONY SLT-A99V">
+ <exif make="SONY" model="SLT-A99V"/>
+ </camera>
+
</cameras>
Modified: branches/4175-enfuse/src/rs-toolbox.c
===================================================================
--- branches/4175-enfuse/src/rs-toolbox.c 2012-10-29 16:09:11 UTC (rev
4305)
+++ branches/4175-enfuse/src/rs-toolbox.c 2012-10-29 18:28:05 UTC (rev
4306)
@@ -390,6 +390,7 @@
/* Check if we can find a hidden window and just re-use
that */
if ((popup = g_object_get_data(G_OBJECT(range),
"rs-popup")))
{
+ gtk_widget_show_all(popup);
gtk_window_present(GTK_WINDOW(popup));
break;
}
@@ -418,6 +419,7 @@
g_signal_connect (popup, "delete-event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
gtk_widget_show_all(popup);
+ gtk_window_present(GTK_WINDOW(popup));
}
default:
break;
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
