Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24533
Modified Files:
ufraw_preview.c ufraw_writer.c
Log Message:
Fixed rotation and crop issue from last commit.
Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ufraw_writer.c 1 Sep 2009 05:24:51 -0000 1.60
+++ ufraw_writer.c 1 Sep 2009 15:08:07 -0000 1.61
@@ -207,10 +207,9 @@
int width, int height, int left, int top, int bitDepth, int grayscaleMode,
int (*row_writer) (ufraw_data *, void * volatile, void *, int, int, int,
int, int))
{
- int row, row0, rowStride;
- image_type *rawImage;
- rowStride = uf->image.width;
- rawImage = uf->image.image;
+ int row, row0;
+ int rowStride = uf->image.width;
+ image_type *rawImage = uf->image.image;
int byteDepth = (bitDepth+7)/8;
guint8 pixbuf8[rowStride * 3 * byteDepth * DEVELOP_BATCH];
@@ -245,7 +244,7 @@
for (row = 0; row < DEVELOP_BATCH; row++) {
if (row + row0 >= height)
continue;
- guint8 *rowbuf = &pixbuf8[row * rowStride * 3 * byteDepth];
+ guint8 *rowbuf = &pixbuf8[row * width * 3 * byteDepth];
ufraw_rotate_row(&image, rowbuf, uf->conf->rotationAngle,
bitDepth, top+row+row0, left, width);
if (grayscaleMode)
@@ -268,7 +267,7 @@
for (row = 0; row < DEVELOP_BATCH; row++) {
if (row + row0 >= height)
continue;
- guint8 *rowbuf = &pixbuf8[row * rowStride * 3 * byteDepth];
+ guint8 *rowbuf = &pixbuf8[row * width * 3 * byteDepth];
develop(rowbuf, rawImage[(top+row+row0)*rowStride+left],
uf->developer, bitDepth, width);
if (grayscaleMode)
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- ufraw_preview.c 1 Sep 2009 05:24:51 -0000 1.263
+++ ufraw_preview.c 1 Sep 2009 15:08:07 -0000 1.264
@@ -4830,7 +4830,7 @@
data->RotationAdjustment = adjustment_scale(
table, 0, 0, _("Rotation"),
data->unnormalized_angle, &data->unnormalized_angle,
- -360, 360, 0.1, 1, 2, _("Rotation Angle"),
+ -180, 180, 0.1, 1, 2, _("Rotation Angle"),
G_CALLBACK(adjustment_update_rotation),
&data->ResetRotationAdjustment, _("Reset Rotation Angle"),
G_CALLBACK(adjustment_reset_rotation));
------------------------------------------------------------------------------
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
