On Thu, Nov 26, 2009 at 10:59:52AM +0100, Frank van Maarseveen wrote:
> On Wed, Nov 25, 2009 at 06:13:17PM -0600, Udi Fuchs wrote:
[...]
> >
> > 5. Why did you move ufraw_developer_prepare() before
> > developer_display_profile()? The former is using the display profile
> > from the later.
>
> Hmm, apparently we have a circular dependency here. Without
> I get a SIGSEGV. I can paper over this issue by adding a second
> ufraw_developer_prepare() call but maybe there's a better fix.
Better restore the old calls. A call was removed from ufraw_preview()
and this explains the issue I had with it. Still, it doesn't feel
right to need _two_ ufraw_developer_prepare() calls.
--
Frank
diff --git a/ufraw_preview.c b/ufraw_preview.c
index 7fe501a..4cca459 100644
--- a/ufraw_preview.c
+++ b/ufraw_preview.c
@@ -949,7 +949,6 @@ static gboolean render_preview_now(preview_data *data)
CFG->curve[CFG->curveIndex].m_anchors[0].x);
gtk_label_set_text(GTK_LABEL(data->BlackLabel), text);
- ufraw_developer_prepare(data->UF, display_developer);
if ( CFG->profileIndex[display_profile]==0 ) {
guint8 *displayProfile;
gint profileSize;
@@ -963,6 +962,7 @@ static gboolean render_preview_now(preview_data *data)
CFG->profile[display_profile]
[CFG->profileIndex[display_profile]].productName);
}
+ ufraw_developer_prepare(data->UF, display_developer);
ufraw_convert_prepare_buffers(data->UF);
/* This will trigger the untiled phases if necessary. The progress bar
@@ -5871,6 +5871,9 @@ int ufraw_preview(ufraw_data *uf, conf_data *rc, int
plugin,
CFG->size = 0;
}
+ /* There's another call in render_preview_now() and both are needed */
+ ufraw_developer_prepare(uf, display_developer);
+
/* Save initial WB data for the sake of "Reset WB" */
g_strlcpy(data->initialWB, CFG->wb, max_name);
data->initialTemperature = CFG->temperature;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
ufraw-devel mailing list
ufraw-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-devel
