Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31260

Modified Files:
        ufraw_preview.c ufraw_ufraw.c 
Log Message:
Make rendering of small sizes a bit faster.
Small cleanups.


Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- ufraw_ufraw.c       10 Nov 2009 03:36:05 -0000      1.213
+++ ufraw_ufraw.c       10 Nov 2009 06:22:16 -0000      1.214
@@ -1108,7 +1108,7 @@
        int cropWidth = uf->conf->CropX2 - uf->conf->CropX1;
        int cropSize = MAX(cropHeight, cropWidth);
        if (cropSize/uf->conf->size >= 2)
-           scale = 2;
+           scale = cropSize / uf->conf->size;
     }
 
     if (uf->HaveFilters && scale == 1)

Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- ufraw_preview.c     10 Nov 2009 04:39:16 -0000      1.304
+++ ufraw_preview.c     10 Nov 2009 06:22:16 -0000      1.305
@@ -812,7 +812,6 @@
 {
     if (data->FreezeDialog) return;
 
-    render_init(data);
     data->RenderSubArea = 0;
     while (g_idle_remove_by_data(data))
        ;
@@ -1077,13 +1076,11 @@
     if (subarea < 0) {
         data->RenderSubArea = -1;
     } else {
-       ufraw_image_data *img1 = ufraw_convert_image_area(
-           data->UF, subarea, ufraw_phases_num - 1);
-       if (img1) {
-           UFRectangle area = ufraw_image_get_subarea_rectangle(img1, subarea);
-           preview_draw_area(data, area.x, area.y, area.width, area.height);
-           again = TRUE;
-       }
+       ufraw_image_data *img1 = ufraw_convert_image_area(data->UF,
+               subarea, ufraw_phases_num - 1);
+       UFRectangle area = ufraw_image_get_subarea_rectangle(img1, subarea);
+       preview_draw_area(data, area.x, area.y, area.width, area.height);
+       again = TRUE;
     }
 
 #ifdef _OPENMP


------------------------------------------------------------------------------
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-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to