Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14172
Modified Files:
configure.ac ufraw_developer.c ufraw_exiv2.cc
Log Message:
Various code clean-ups.
Index: ufraw_developer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_developer.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- ufraw_developer.c 27 Jan 2010 21:23:22 -0000 1.81
+++ ufraw_developer.c 26 Feb 2010 03:30:10 -0000 1.82
@@ -351,15 +351,6 @@
d->saturationProfile==NULL ) {
/* No transformation at all. */
d->colorTransform = NULL;
-#if defined(LCMS_VERSION) && LCMS_VERSION <= 113 /* Bypass a lcms 1.13 bug. */
- } else if ( d->luminosityProfile==NULL
- && d->adjustmentProfile==NULL
- && d->saturationProfile==NULL ) {
- d->colorTransform = cmsCreateTransform(
- d->profile[in_profile], TYPE_RGB_16,
- d->profile[targetProfile], TYPE_RGB_16,
- d->intent[out_profile], 0);
-#endif
} else {
cmsHPROFILE prof[5];
int i = 0;
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- configure.ac 24 Feb 2010 17:44:26 -0000 1.151
+++ configure.ac 26 Feb 2010 03:30:10 -0000 1.152
@@ -106,7 +106,7 @@
[ with_dosprefix=NONE ] )
PKG_CHECK_MODULES(GLIB, glib-2.0 gthread-2.0)
-PKG_CHECK_MODULES(LCMS, lcms)
+PKG_CHECK_MODULES(LCMS, lcms >= 1.14)
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk],
@@ -252,7 +252,7 @@
[ have_cfitsio=no
AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] )
-PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.11,
+PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16,
[ have_exiv2=yes
AC_DEFINE(HAVE_EXIV2, 1, have the exiv2 library) ],
[ have_exiv2=no
Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ufraw_exiv2.cc 23 Jan 2010 05:00:58 -0000 1.55
+++ ufraw_exiv2.cc 26 Feb 2010 03:30:10 -0000 1.56
@@ -23,12 +23,6 @@
#include <sstream>
#include <cassert>
-// EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
-#ifndef EXIV2_TEST_VERSION
-# define EXIV2_TEST_VERSION(major,minor,patch) \
- ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
-#endif
-
/*
* Helper function to copy a string to a buffer, converting it from
* current locale (in which exiv2 often returns strings) to UTF-8.
@@ -196,11 +190,9 @@
} else if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Minolta.LensID")))
!= exifData.end() ) {
uf_strlcpy_to_utf8(uf->conf->lensText, max_name, pos, exifData);
-#if EXIV2_TEST_VERSION(0,16,0)
} else if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Pentax.LensType")))
!= exifData.end() ) {
uf_strlcpy_to_utf8(uf->conf->lensText, max_name, pos, exifData);
-#endif
}
#endif
/* Read flash mode */
@@ -322,11 +314,9 @@
/* Delete various MakerNote fields only applicable to the raw file */
// Nikon thumbnail data
-#if EXIV2_TEST_VERSION(0,13,0)
if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Nikon3.Preview")))
!= exifData.end() )
exifData.erase(pos);
-#endif
#if EXIV2_TEST_VERSION(0,18,0)
if (
(pos=exifData.findKey(Exiv2::ExifKey("Exif.NikonPreview.JPEGInterchangeFormat")))
!= exifData.end() )
@@ -338,7 +328,6 @@
exifData.erase(pos);
#endif
-#if EXIV2_TEST_VERSION(0,16,0)
// Pentax thumbnail data
if (
(pos=exifData.findKey(Exiv2::ExifKey("Exif.Pentax.PreviewResolution")))
!= exifData.end() )
@@ -349,7 +338,6 @@
if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Pentax.PreviewOffset")))
!= exifData.end() )
exifData.erase(pos);
-#endif
// Minolta thumbnail data
if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Minolta.Thumbnail")))
@@ -362,7 +350,6 @@
!= exifData.end() )
exifData.erase(pos);
-#if EXIV2_TEST_VERSION(0,13,0)
// Olympus thumbnail data
if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Olympus.Thumbnail")))
!= exifData.end() )
@@ -373,16 +360,14 @@
if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Olympus.ThumbnailLength")))
!= exifData.end() )
exifData.erase(pos);
-#endif
/* Write appropriate color space tag if using sRGB output */
if (!strcmp(uf->developer->profileFile[out_profile], ""))
exifData["Exif.Photo.ColorSpace"] = uint16_t(1); /* sRGB */
-#if EXIV2_TEST_VERSION(0,14,0)
/* Add "UFRaw" and version used to output file as processing software. */
exifData["Exif.Image.ProcessingSoftware"] = "UFRaw " VERSION;
-#endif
+
return exifData;
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
