Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4444
Modified Files:
configure.ac ufraw_ufraw.c
Log Message:
Fix rendering issue and build without lensfun for last commit.
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- configure.ac 20 Nov 2009 04:40:05 -0000 1.147
+++ configure.ac 21 Nov 2009 06:17:05 -0000 1.148
@@ -258,7 +258,7 @@
[ have_exiv2=no
AC_MSG_RESULT($EXIV2_PKG_ERRORS) ] )
-PKG_CHECK_MODULES(LENSFUN, lensfun >= 0.2.3,
+PKG_CHECK_MODULES(LENSFUN, lensfun >= 0.2.5,
[ have_lensfun=yes
AC_DEFINE(HAVE_LENSFUN, 1, have the lensfun library) ],
[ have_lensfun=no
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- ufraw_ufraw.c 21 Nov 2009 05:51:59 -0000 1.218
+++ ufraw_ufraw.c 21 Nov 2009 06:17:05 -0000 1.219
@@ -834,7 +834,11 @@
srcX, srcY, 1, 1, buff);
}
#endif
- for (c = 0; c < 3; c++, modcoord += 2) {
+ for (c = 0; c < 3; c++
+#ifdef HAVE_LENSFUN
+ , modcoord += 2
+#endif
+ ) {
#ifdef HAVE_LENSFUN
if (applyLF) {
srcX = modcoord[0];
@@ -1351,10 +1355,10 @@
img = &uf->Images[ufraw_transform_phase];
if (img->valid == 0) {
ufraw_convert_prepare_transform_buffer(uf, img, width, height);
- if (img->buffer != NULL) {
- width = img->width;
- height = img->height;
- }
+ }
+ if (img->buffer != NULL) {
+ width = img->width;
+ height = img->height;
}
img = &uf->Images[ufraw_develop_phase];
if (img->valid == 0) {
------------------------------------------------------------------------------
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
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
