Apparently render_prepare() called ufraw_developer_prepare() which
destroyed a special 0x10000 value in uf->developer->rgbWB[] in case
of an unshrinked conversion, see ufraw_convert_image_first_phase() for
this.
diff --git a/ufraw_preview.c b/ufraw_preview.c
index 34b0697..8e9ef1b 100644
--- a/ufraw_preview.c
+++ b/ufraw_preview.c
@@ -873,24 +873,6 @@ static gboolean render_prepare(preview_data *data)
CFG->curve[CFG->curveIndex].m_anchors[0].x);
gtk_label_set_text(GTK_LABEL(data->BlackLabel), text);
- if ( Developer==NULL )
- Developer = developer_init();
-
- if ( CFG->profileIndex[display_profile]==0 ) {
- guint8 *displayProfile;
- gint profileSize;
- uf_get_display_profile(data->PreviewWidget, &displayProfile,
- &profileSize);
- developer_display_profile(Developer, displayProfile, profileSize,
- CFG->profile[display_profile]
- [CFG->profileIndex[display_profile]].productName);
- } else {
- developer_display_profile(Developer, NULL, 0,
- CFG->profile[display_profile]
- [CFG->profileIndex[display_profile]].productName);
- }
- ufraw_developer_prepare(data->UF, display_developer);
-
/* The reset of the rendering can be triggered only after the call to
* ufraw_developer_preare(). Otherwise error messages in this function
* would cause timing problems. */
@@ -1879,6 +1861,24 @@ static void create_base_image(preview_data *data)
CFG->shrink = CFG->Scale;
}
preview_invalidate_layer (data, ufraw_denoise_phase);
+
+ if ( Developer==NULL )
+ Developer = developer_init();
+ if ( CFG->profileIndex[display_profile]==0 ) {
+ guint8 *displayProfile;
+ gint profileSize;
+ uf_get_display_profile(data->PreviewWidget, &displayProfile,
+ &profileSize);
+ developer_display_profile(Developer, displayProfile, profileSize,
+ CFG->profile[display_profile]
+ [CFG->profileIndex[display_profile]].productName);
+ } else {
+ developer_display_profile(Developer, NULL, 0,
+ CFG->profile[display_profile]
+ [CFG->profileIndex[display_profile]].productName);
+ }
+
+ ufraw_developer_prepare(data->UF, display_developer);
ufraw_convert_image_init(data->UF);
ufraw_convert_image_first_phase(data->UF, FALSE);
ufraw_rotate_image_buffer(&data->UF->Images[ufraw_first_phase],
data->UF->conf->rotationAngle);
@@ -4260,7 +4260,7 @@ static void whitebalance_fill_interface(preview_data
*data,
// Zoom percentage spin button:
data->ZoomAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
- CFG->Zoom, 5, 50, 1, 1, 0));
+ CFG->Zoom, 5, 100, 1, 1, 0));
g_object_set_data(G_OBJECT(data->ZoomAdjustment),
"Adjustment-Accuracy", (gpointer)0);
button = gtk_spin_button_new(data->ZoomAdjustment, 1, 0);
@@ -5152,7 +5152,7 @@ int ufraw_preview(ufraw_data *uf, conf_data *rc, int
plugin,
max_preview_height = MIN(def_preview_height, screen.height-152);
CFG->Scale = MAX((uf->rotatedWidth-1)/max_preview_width,
(uf->rotatedHeight-1)/max_preview_height)+1;
- CFG->Scale = MAX(2, CFG->Scale);
+ CFG->Scale = MAX(min_scale, CFG->Scale);
CFG->Zoom = 100.0 / CFG->Scale;
// Make preview size a tiny bit larger to prevent rounding errors
// that will cause the scrollbars to appear.
@@ -5370,7 +5370,7 @@ int ufraw_preview(ufraw_data *uf, conf_data *rc, int
plugin,
// Zoom percentage spin button:
data->ZoomAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
- CFG->Zoom, 5, 50, 1, 1, 0));
+ CFG->Zoom, 5, 100, 1, 1, 0));
g_object_set_data(G_OBJECT(data->ZoomAdjustment),
"Adjustment-Accuracy", (gpointer)0);
button = gtk_spin_button_new(data->ZoomAdjustment, 1, 0);
diff --git a/ufraw_ui.h b/ufraw_ui.h
index 2c67ba4..3b6016b 100644
--- a/ufraw_ui.h
+++ b/ufraw_ui.h
@@ -15,7 +15,7 @@
#define raw_his_size 320
#define live_his_size 256
-#define min_scale 2
+#define min_scale 1
#define max_scale 20
typedef struct {
--
Frank
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
ufraw-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-devel
