Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29890
Modified Files:
ufraw.h ufraw_preview.c ufraw_ufraw.c
Log Message:
A small #include simplification.
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- ufraw.h 3 Nov 2009 06:41:31 -0000 1.129
+++ ufraw.h 3 Nov 2009 06:49:39 -0000 1.130
@@ -18,8 +18,6 @@
#endif /* HAVE_LENSFUN */
#include "nikon_curve.h"
-#include <time.h> // for time_t
-#include "dcraw_api.h"
/* macro to clamp a number between two values */
#ifndef LIM
@@ -339,7 +337,7 @@
void ufraw_rotate_image_buffer(ufraw_image_data *img, double angle);
void ufraw_normalize_rotation(ufraw_data *uf);
void ufraw_unnormalize_rotation(ufraw_data *uf);
-void ufraw_get_image_dimensions(dcraw_data *raw, ufraw_data *uf);
+void ufraw_get_image_dimensions(ufraw_data *uf);
void ufraw_img_get_subarea_coord (ufraw_image_data *img, unsigned saidx,
int *x, int *y, int *w, int *h);
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- ufraw_ufraw.c 3 Nov 2009 06:41:31 -0000 1.205
+++ ufraw_ufraw.c 3 Nov 2009 06:49:39 -0000 1.206
@@ -318,9 +318,9 @@
return UFRAW_SUCCESS;
}
-void ufraw_get_image_dimensions(dcraw_data *raw, ufraw_data *uf)
+void ufraw_get_image_dimensions(ufraw_data *uf)
{
- dcraw_image_dimensions(raw, uf->conf->orientation,
+ dcraw_image_dimensions(uf->raw, uf->conf->orientation,
&uf->initialHeight, &uf->initialWidth);
// update rotated dimensions
@@ -534,7 +534,7 @@
}
ufraw_load_darkframe(uf);
- ufraw_get_image_dimensions(raw, uf);
+ ufraw_get_image_dimensions(uf);
return UFRAW_SUCCESS;
}
@@ -622,7 +622,7 @@
memcpy(uf->rgb_cam, raw->rgb_cam, sizeof uf->rgb_cam);
/* Foveon image dimensions are knows only after load_raw()*/
- ufraw_get_image_dimensions(raw, uf);
+ ufraw_get_image_dimensions(uf);
if (uf->conf->CropX2 > uf->rotatedWidth)
uf->conf->CropX2 = uf->rotatedWidth;
if (uf->conf->CropY2 > uf->rotatedHeight)
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- ufraw_preview.c 31 Oct 2009 05:18:37 -0000 1.294
+++ ufraw_preview.c 3 Nov 2009 06:49:39 -0000 1.295
@@ -2157,7 +2157,7 @@
}
// image dimensions cannot really change here,
// yet width and height might be flipped (independent of flip&4).
- ufraw_get_image_dimensions(data->UF->raw, data->UF);
+ ufraw_get_image_dimensions(data->UF);
++data->FreezeDialog;
ufraw_unnormalize_rotation(data->UF);
@@ -2919,7 +2919,7 @@
gtk_widget_set_sensitive(data->ResetRotationAdjustment,
CFG->rotationAngle != 0 ||
CFG->orientation != CFG->CameraOrientation);
- ufraw_get_image_dimensions(data->UF->raw, data->UF);
+ ufraw_get_image_dimensions(data->UF);
if (FullCrop) {
if (CFG->LockAspect) {
double newAspect = (double)data->UF->rotatedWidth /
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) 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/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
