Hello community,
here is the log from the commit of package ufraw
checked in at Tue Aug 15 18:35:37 CEST 2006.
--------
--- ufraw/ufraw.changes 2006-08-04 13:02:05.000000000 +0200
+++ ufraw/ufraw.changes 2006-08-15 15:17:13.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug 15 15:13:35 CEST 2006 - postadal@suse.cz
+
+- updated to version 0.9.1
+ * updated dcraw to 8.29 (1.340)
+ * recognize Sony's *.arw file type
+ * treat Minolta's Alpha and Maxxum as the Dynax for WB presets
+
+-------------------------------------------------------------------
Old:
----
ufraw-0.9.tar.bz2
New:
----
ufraw-0.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ufraw.spec ++++++
--- /var/tmp/diff_new_pack.LBgmKn/_old 2006-08-15 18:35:27.000000000 +0200
+++ /var/tmp/diff_new_pack.LBgmKn/_new 2006-08-15 18:35:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ufraw (Version 0.9 )
+# spec file for package ufraw (Version 0.9.1 )
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,9 +24,9 @@
Enhances: gimp-2.0
Suggests: dcraw-gnome
%endif
-Version: 0.9
+Version: 0.9.1
Release: 1
-%define vversion 0.9
+%define vversion 0.9.1
Summary: The Unidentified Flying Raw
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-desktop.patch
@@ -104,6 +104,11 @@
%_gimpplugindir/plug-ins/
%changelog -n ufraw
+* Tue Aug 15 2006 - postadal@suse.cz
+- updated to version 0.9.1
+ * updated dcraw to 8.29 (1.340)
+ * recognize Sony's *.arw file type
+ * treat Minolta's Alpha and Maxxum as the Dynax for WB presets
* Fri Aug 04 2006 - postadal@suse.cz
- updated to version 0.9
* add darkframe subtraction option
++++++ ufraw-0.9.tar.bz2 -> ufraw-0.9.1.tar.bz2 ++++++
++++ 11037 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/README new/ufraw-0.9.1/README
--- old/ufraw-0.9/README 2006-08-01 22:48:07.000000000 +0200
+++ new/ufraw-0.9.1/README 2006-08-11 23:08:11.000000000 +0200
@@ -44,8 +44,8 @@
If some of the lines end with 'no' instead of 'yes', it is not the end of
the world. It only means that this option in UFRaw will be disabled. EXIF
support is disabled by default. It can be enabled for Canon (CRW, CR2),
-Nikon (NEF), Pentax (PEF), Samsung (PEF), Sony (SR2, ARW) and Adobe's DNG
-by running configure as:
+Minolta (MRW), Nikon (NEF), Pentax (PEF), Samsung (PEF), Sony (SR2, ARW)
+and Adobe's DNG by running configure as:
./configure --with-exiv2 (requires exiv2-0.10 or newer)
and for Fuji (RAF) by:
./configure --with-libexif (requires libexif-0.6.13 or newer)
@@ -213,7 +213,13 @@
History
=======
-xx/08/2006 - UFRaw-0.9 released, based on DCRaw v8.28.
+11/08/2006 - UFRaw-0.9.1 released, based on DCRaw v8.29.
+* Recognize Sony's *.arw file type.
+* Redirect exiv2 warnings from the terminal to the log.
+* Fix build for some build environments (libjpeg errors).
+* Treat Minolta's Alpha and Maxxum models as the Dynax model for WB presets.
+
+03/08/2006 - UFRaw-0.9 released, based on DCRaw v8.28.
* Display EXIF data in user interface.
* Add darkframe subtraction option.
* More conservative highlight unclipping.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/config.h.in new/ufraw-0.9.1/config.h.in
--- old/ufraw-0.9/config.h.in 2006-06-05 16:37:28.000000000 +0200
+++ new/ufraw-0.9.1/config.h.in 2006-08-10 21:51:25.000000000 +0200
@@ -78,16 +78,16 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* The size of a `double', as computed by sizeof. */
+/* The size of `double', as computed by sizeof. */
#undef SIZEOF_DOUBLE
-/* The size of a `float', as computed by sizeof. */
+/* The size of `float', as computed by sizeof. */
#undef SIZEOF_FLOAT
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* Define to 1 if you have the ANSI C header files. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/configure.ac new/ufraw-0.9.1/configure.ac
--- old/ufraw-0.9/configure.ac 2006-06-05 16:28:35.000000000 +0200
+++ new/ufraw-0.9.1/configure.ac 2006-08-10 21:50:53.000000000 +0200
@@ -1,5 +1,5 @@
-dnl $Id: configure.ac,v 1.43 2006/05/31 05:39:09 nkbj Exp $
-AC_INIT(UFRaw, 0.9)
+dnl $Id: configure.ac,v 1.44 2006/08/04 22:22:11 udifuchs Exp $
+AC_INIT(UFRaw, 0.9.1)
AC_PREREQ(2.57)
# Create host_os, host_cpu variables
@@ -238,7 +238,7 @@
AC_MSG_CHECKING(whether to build extras)
AC_ARG_ENABLE(extras,
- [ --enable-extras build extra (dcraw, nikon-curve, ufraw-exif) executables], ,
+ [ --enable-extras build extra (dcraw, nikon-curve) executables], ,
enable_extras=no)
AC_MSG_RESULT($enable_extras)
AM_CONDITIONAL(MAKE_EXTRAS, test $enable_extras = yes)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/dcraw.cc new/ufraw-0.9.1/dcraw.cc
--- old/ufraw-0.9/dcraw.cc 2006-08-01 23:14:16.000000000 +0200
+++ new/ufraw-0.9.1/dcraw.cc 2006-08-10 21:50:37.000000000 +0200
@@ -15,15 +15,15 @@
license. Naturaly, the GPL license applies only to this derived
work.
- $Revision: 1.338 $
- $Date: 2006/07/31 21:34:50 $
+ $Revision: 1.340 $
+ $Date: 2006/08/08 15:06:13 $
*/
#ifdef HAVE_CONFIG_H /*For UFRaw config system - NKBJ*/
#include "config.h"
#endif
-#define DCRAW_VERSION "8.28"
+#define DCRAW_VERSION "8.29"
//#define _GNU_SOURCE /*UF*/
#define _USE_MATH_DEFINES
@@ -42,7 +42,9 @@
NO_LCMS disables the "-p" option.
*/
#ifdef HAVE_LIBJPEG
+extern "C" {
#include
+}
#endif
#ifndef NO_LCMS
#include
@@ -1596,6 +1598,7 @@
}
if (ble > bls) black /= (ble - bls) * height;
free (data);
+ maximum = 0xfff;
}
void CLASS olympus_cseries_load_raw()
@@ -3980,6 +3983,7 @@
for (i=19; i--; ) str[i] = fgetc(ifp);
else
fread (str, 19, 1, ifp);
+ memset (&t, 0, sizeof t);
if (sscanf (str, "%d:%d:%d %d:%d:%d", &t.tm_year, &t.tm_mon,
&t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec) != 6)
return;
@@ -4514,7 +4518,10 @@
switch (tiff_compress) {
case 0: case 1:
load_raw = tiff_bps > 8 ?
- &CLASS unpacked_load_raw : &CLASS eight_bit_load_raw; break;
+ &CLASS unpacked_load_raw : &CLASS eight_bit_load_raw;
+ if (tiff_ifd[raw].bytes * 5 == raw_width * raw_height * 8)
+ load_raw = &CLASS olympus_e300_load_raw;
+ break;
case 6: case 7: case 99:
load_raw = &CLASS lossless_jpeg_load_raw; break;
case 262:
@@ -4771,6 +4778,7 @@
struct tm t;
fseek (ifp, 0, SEEK_SET);
+ memset (&t, 0, sizeof t);
do {
fgets (line, 128, ifp);
if ((val = strchr(line,'=')))
@@ -4943,6 +4951,7 @@
} else if (!memcmp(tag,"IDIT",4) && size < 64) {
fread (date, 64, 1, ifp);
date[size] = 0;
+ memset (&t, 0, sizeof t);
if (sscanf (date, "%*s %s %d %d:%d:%d %d", month, &t.tm_mday,
&t.tm_hour, &t.tm_min, &t.tm_sec, &t.tm_year) == 6) {
for (i=0; i < 12 && strcmp(mon[i],month); i++);
@@ -6107,13 +6116,8 @@
!strcmp(model,"E-500")) {
width -= 20;
maximum = 0xfc30;
- if (fsize <= 15728640) {
- maximum = 0xfff;
- load_raw = &CLASS olympus_e300_load_raw;
- }
} else if (!strcmp(model,"E-330")) {
width -= 30;
- load_raw = &CLASS olympus_e300_load_raw;
} else if (!strcmp(model,"C770UZ")) {
height = 1718;
width = 2304;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/dcraw_api.cc new/ufraw-0.9.1/dcraw_api.cc
--- old/ufraw-0.9/dcraw_api.cc 2006-07-30 18:34:43.000000000 +0200
+++ new/ufraw-0.9.1/dcraw_api.cc 2006-08-10 21:50:37.000000000 +0200
@@ -448,11 +448,14 @@
void dcraw_message(void *dcraw, int code, char *format, ...)
{
+ char *message;
DCRaw *d = (DCRaw *)dcraw;
va_list ap;
va_start(ap, format);
- d->dcraw_message(code, format, ap);
+ message = g_strdup_vprintf(format, ap);
+ d->dcraw_message(code, message);
va_end(ap);
+ g_free(message);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/ufraw_exiv2.cc new/ufraw-0.9.1/ufraw_exiv2.cc
--- old/ufraw-0.9/ufraw_exiv2.cc 2006-07-19 20:33:58.000000000 +0200
+++ new/ufraw-0.9.1/ufraw_exiv2.cc 2006-08-10 21:50:37.000000000 +0200
@@ -25,11 +25,18 @@
}
extern "C" int ufraw_exif_from_exiv2(ufraw_data *uf)
+{
+ /* Redirect exiv2 errors to a string buffer */
+ std::ostringstream stderror;
+ std::streambuf *savecerr = std::cerr.rdbuf();
+ std::cerr.rdbuf(stderror.rdbuf());
+
try {
uf->exifBuf = NULL;
uf->exifBufLen = 0;
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uf->filename);
+
assert(image.get() != 0);
image->readMetadata();
@@ -165,10 +172,16 @@
str << *pos;
g_strlcpy(uf->conf->lensText, str.str().c_str(), max_name);
}
+ std::cerr.rdbuf(savecerr);
+ ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());
+
return UFRAW_SUCCESS;
}
catch (Exiv2::AnyError& e) {
+ std::cerr.rdbuf(savecerr);
ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str());
return UFRAW_ERROR;
}
+
+}
#endif /* HAVE_EXIV2 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/ufraw_preview.c new/ufraw-0.9.1/ufraw_preview.c
--- old/ufraw-0.9/ufraw_preview.c 2006-07-30 19:58:27.000000000 +0200
+++ new/ufraw-0.9.1/ufraw_preview.c 2006-08-11 23:08:11.000000000 +0200
@@ -1926,13 +1926,23 @@
data->WBPresets = NULL;
const wb_data *lastPreset = NULL;
gboolean make_model_match = FALSE, make_model_fine_tuning = FALSE;
+ char model[max_name];
+ if ( strcmp(uf->conf->make,"MINOLTA")==0 &&
+ ( strncmp(uf->conf->model, "ALPHA", 5)==0 ||
+ strncmp(uf->conf->model, "MAXXUM", 6)==0 ) ) {
+ /* Canonize Minolta model names (copied from dcraw) */
+ g_snprintf(model, max_name, "DYNAX %s",
+ uf->conf->model+6+(uf->conf->model[0]=='M'));
+ } else {
+ g_strlcpy(model, uf->conf->model, max_name);
+ }
for (i=0; iWBPresets = g_list_append(data->WBPresets, wb_preset[i].name);
gtk_combo_box_append_text(data->WBCombo, wb_preset[i].name);
} else if ( (strcmp(wb_preset[i].make, uf->conf->make)==0 ) &&
- (strcmp(wb_preset[i].model, uf->conf->model)==0)) {
+ (strcmp(wb_preset[i].model, model)==0)) {
/* Camera specific presets */
make_model_match = TRUE;
if ( lastPreset==NULL ||
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/ufraw_routines.c new/ufraw-0.9.1/ufraw_routines.c
--- old/ufraw-0.9/ufraw_routines.c 2006-07-21 21:28:14.000000000 +0200
+++ new/ufraw-0.9.1/ufraw_routines.c 2006-08-10 21:50:37.000000000 +0200
@@ -97,7 +97,7 @@
}
}
-const char raw_ext[]= "bay,bmq,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,jpg,k25,"
+const char raw_ext[]= "arw,bay,bmq,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,jpg,k25,"
"kdc,mdc,mos,mrw,nef,orf,pef,pxn,raf,raw,rdc,sr2,srf,sti,tif,ufraw,x3f";
const char *file_type[] = { ".ppm", ".ppm", ".tif", ".tif", ".jpg" };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/ufraw_ufraw.c new/ufraw-0.9.1/ufraw_ufraw.c
--- old/ufraw-0.9/ufraw_ufraw.c 2006-07-21 21:30:30.000000000 +0200
+++ new/ufraw-0.9.1/ufraw_ufraw.c 2006-08-11 23:08:11.000000000 +0200
@@ -600,10 +600,20 @@
uf->conf->WBTuning = 0;
} else {
int lastTuning = -1;
+ char model[max_name];
+ if ( strcmp(uf->conf->make,"MINOLTA")==0 &&
+ ( strncmp(uf->conf->model, "ALPHA", 5)==0 ||
+ strncmp(uf->conf->model, "MAXXUM", 6)==0 ) ) {
+ /* Canonize Minolta model names (copied from dcraw) */
+ g_snprintf(model, max_name, "DYNAX %s",
+ uf->conf->model+6+(uf->conf->model[0]=='M'));
+ } else {
+ g_strlcpy(model, uf->conf->model, max_name);
+ }
for (i=0; iconf->wb, wb_preset[i].name) &&
!strcmp(uf->conf->make, wb_preset[i].make) &&
- !strcmp(uf->conf->model, wb_preset[i].model) ) {
+ !strcmp(model, wb_preset[i].model) ) {
if (uf->conf->WBTuning == wb_preset[i].tuning) {
for (c=0; c<raw->colors; c++)
uf->conf->chanMul[c] = wb_preset[i].channel[c];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw-0.9/wb_presets.c new/ufraw-0.9.1/wb_presets.c
--- old/ufraw-0.9/wb_presets.c 2006-08-01 20:48:55.000000000 +0200
+++ new/ufraw-0.9.1/wb_presets.c 2006-08-11 23:08:11.000000000 +0200
@@ -27,6 +27,8 @@
* It is enough to give only the extreme values, the other values
* will be interpolated.
* Column 5 - Channel multipliers.
+ *
+ * Minolta's ALPHA and MAXXUM models are treated as the DYNAX model.
*/
const wb_data wb_preset[] = {
@@ -41,6 +43,13 @@
{ "Canon", "PowerShot G2", "Daylight Fluorescent", 0, { 2.029637, 1, 1.286807, 0 } },
{ "Canon", "PowerShot G2", "Flash", 0, { 2.153576, 1, 1.140680, 0 } },
+ { "Canon", "PowerShot G3", "Daylight", 0, { 1.858513, 1, 1.387290, 0 } },
+ { "Canon", "PowerShot G3", "Cloudy", 0, { 1.951132, 1, 1.305125, 0 } },
+ { "Canon", "PowerShot G3", "Tungsten", 0, { 1.128386, 1, 2.313310, 0 } },
+ { "Canon", "PowerShot G3", "Fluorescent", 0, { 1.715573, 1, 2.194337, 0 } },
+ { "Canon", "PowerShot G3", "Fluorescent H", 0, { 2.580563, 1, 1.496164, 0 } },
+ { "Canon", "PowerShot G3", "Flash", 0, { 2.293173, 1, 1.187416, 0 } },
+
{ "Canon", "PowerShot G5", "Daylight", 0, { 1.639521, 1, 1.528144, 0 } },
{ "Canon", "PowerShot G5", "Cloudy", 0, { 1.702153, 1, 1.462919, 0 } },
{ "Canon", "PowerShot G5", "Tungsten", 0, { 1.135071, 1, 2.374408, 0 } },
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org