rpms/kdegraphics/devel kdegraphics-4.1.2-libkdcraw-0.4.0.patch, NONE, 1.1 kdegraphics-4.1.2-libkexiv2-0.4.0.patch, NONE, 1.1 kdegraphics.spec, 1.170, 1.171 sources, 1.57, 1.58
Kevin Kofler
kkofler at fedoraproject.org
Mon Oct 6 21:05:19 UTC 2008
- Previous message: rpms/kdegraphics/F-10 kdegraphics-4.1.2-libkdcraw-0.4.0.patch, NONE, 1.1 kdegraphics-4.1.2-libkexiv2-0.4.0.patch, NONE, 1.1 kdegraphics.spec, 1.170, 1.171 sources, 1.57, 1.58
- Next message: rpms/ecl/F-8 ecl.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325/devel
Modified Files:
kdegraphics.spec sources
Added Files:
kdegraphics-4.1.2-libkdcraw-0.4.0.patch
kdegraphics-4.1.2-libkexiv2-0.4.0.patch
Log Message:
* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-3
- respun tarball
- backport latest libkexiv2 and libkdcraw from trunk
kdegraphics-4.1.2-libkdcraw-0.4.0.patch:
--- NEW FILE kdegraphics-4.1.2-libkdcraw-0.4.0.patch ---
Index: test/raw2png.cpp
===================================================================
--- test/raw2png.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkdcraw) (revision 0)
+++ test/raw2png.cpp (.../trunk/KDE/kdegraphics/libs/libkdcraw) (revision 868654)
@@ -0,0 +1,123 @@
+/* ============================================================
+ *
+ * This file is a part of kipi-plugins project
+ * http://www.kipi-plugins.org
+ *
+ * Date : 2008-15-09
+ * Description : a command line tool to convert RAW file to PNG
+ *
+ * Copyright (C) 2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * ============================================================ */
+
+// Qt includes.
+
+#include <qstring.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+
+// KDE includes.
+
+#include "kdeversion.h"
+
+#if KDE_IS_VERSION(4,0,0)
+#include "qdebug.h"
+#define PRINT_DEBUG qDebug()
+#define ENDL
+#else
+#include "kdebug.h"
+#define PRINT_DEBUG kdDebug()
+#define ENDL << endl
+#endif
+
+// Local includes.
+
+#include "kdcraw.h"
+
+using namespace KDcrawIface;
+
+int main (int argc, char **argv)
+{
+ if(argc != 2)
+ {
+ PRINT_DEBUG << "raw2png - RAW Camera Image to PNG Converter" ENDL;
+ PRINT_DEBUG << "Usage: <rawfile>" ENDL;
+ return -1;
+ }
+
+ QString filePath(argv[1]);
+ QFileInfo input(filePath);
+ QString previewFilePath(input.baseName() + QString(".preview.png"));
+ QFileInfo previewOutput(previewFilePath);
+ QString halfFilePath(input.baseName() + QString(".half.png"));
+ QFileInfo halfOutput(halfFilePath);
+ QImage image;
+ DcrawInfoContainer identify;
+
+ // -----------------------------------------------------------
+
+ PRINT_DEBUG << "raw2png: Identify RAW image from " << input.fileName() ENDL;
+
+ KDcraw rawProcessor;
+ if (!rawProcessor.rawFileIdentify(identify, filePath))
+ {
+ PRINT_DEBUG << "raw2png: Idendify RAW image failed. Aborted..." ENDL;
+ return -1;
+ }
+
+ int width = identify.imageSize.width();
+ int height = identify.imageSize.height();
+
+ PRINT_DEBUG << "raw2png: Raw image info:" ENDL;
+ PRINT_DEBUG << "--- Date: " << identify.dateTime.toString(Qt::ISODate) ENDL;
+ PRINT_DEBUG << "--- Make: " << identify.make ENDL;
+ PRINT_DEBUG << "--- Model: " << identify.model ENDL;
+ PRINT_DEBUG << "--- Size: " << width << "x" << height ENDL;
+ PRINT_DEBUG << "--- Filter: " << identify.filterPattern ENDL;
+ PRINT_DEBUG << "--- Colors: " << identify.rawColors ENDL;
+
+ // -----------------------------------------------------------
+
+ PRINT_DEBUG << "raw2png: Loading RAW image preview" ENDL;
+
+ if (!rawProcessor.loadDcrawPreview(image, filePath))
+ {
+ PRINT_DEBUG << "raw2png: Loading RAW image preview failed. Aborted..." ENDL;
+ return -1;
+ }
+
+ PRINT_DEBUG << "raw2png: Saving preview image to "
+ << previewOutput.fileName() << " size ("
+ << image.width() << "x" << image.height()
+ << ")" ENDL;
+ image.save(previewFilePath, "PNG");
+
+ // -----------------------------------------------------------
+
+ PRINT_DEBUG << "raw2png: Loading half RAW image" ENDL;
+
+ image = QImage();
+ if (!rawProcessor.loadHalfPreview(image, filePath))
+ {
+ PRINT_DEBUG << "raw2png: Loading half RAW image failed. Aborted..." ENDL;
+ return -1;
+ }
+
+ PRINT_DEBUG << "raw2png: Saving half image to "
+ << halfOutput.fileName() << " size ("
+ << image.width() << "x" << image.height()
+ << ")" ENDL;
+ image.save(halfFilePath, "PNG");
+
+ return 0;
+}
Property changes on: test/raw2png.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt (.../tags/KDE/4.1.2/kdegraphics/libs/libkdcraw) (revision 0)
+++ test/CMakeLists.txt (.../trunk/KDE/kdegraphics/libs/libkdcraw) (revision 868654)
@@ -0,0 +1,29 @@
+
+KDE4_NO_ENABLE_FINAL(kdcraw)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libkdcraw)
+
+# Disable dcraw C Ansi code warnings from LibRaw. Just to be clear on the console.
+FOREACH(_curentfile ${libraw_LIB_SRCS})
+ SET_SOURCE_FILES_PROPERTIES(${_curentfile} PROPERTIES COMPILE_FLAGS -w)
+ENDFOREACH(_curentfile ${libraw_LIB_SRCS})
+
+# add a small macro so that this is a bit cleaner
+macro(libkdcraw_build_test)
+ SET(_target ${ARGV0})
+ SET(${_target}_SRCS ../libraw/samples/${_target}.cpp ${libraw_LIB_SRCS})
+ KDE4_ADD_EXECUTABLE(${_target} NOGUI ${${_target}_SRCS})
+ TARGET_LINK_LIBRARIES(${_target} ${MATH_LIBRARY} ${LCMS_LIBRARIES} ${JPEG_LIBRARY} ${OPENMP_LDFLAGS})
+ SET_TARGET_PROPERTIES(${_target} PROPERTIES COMPILE_FLAGS -DLIBRAW_BUILDLIB)
+ IF(WIN32)
+ TARGET_LINK_LIBRARIES(${_target} ws2_32)
+ ENDIF(WIN32)
+endmacro(libkdcraw_build_test)
+
+SET(raw2png_SRCS raw2png.cpp)
+KDE4_ADD_EXECUTABLE(raw2png NOGUI ${raw2png_SRCS})
+TARGET_LINK_LIBRARIES(raw2png kdcraw)
+
+libkdcraw_build_test( identify )
+libkdcraw_build_test( simple_dcraw )
+libkdcraw_build_test( mem_image )
+libkdcraw_build_test( dcraw_emu )
\ No newline at end of file
Property changes on: test/CMakeLists.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Index: libraw/libraw/libraw_alloc.h
===================================================================
--- libraw/libraw/libraw_alloc.h (.../tags/KDE/4.1.2/kdegraphics/libs/libkdcraw) (revision 0)
+++ libraw/libraw/libraw_alloc.h (.../trunk/KDE/kdegraphics/libs/libkdcraw) (revision 868654)
@@ -0,0 +1,98 @@
+/* -*- C++ -*-
+ * File: libraw_alloc.h
+ * Copyright 2008 Alex Tutubalin <lexa at lexa.ru>
+ * Created: Sat Mar 22, 2008
+ *
+ * LibRaw C++ interface
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
[...17277 lines suppressed...]
+ New cameras: Canon EOS 450D, Nikon D60, and Fuji S100FS.
+ Copied new matrices from Adobe DNG Converter 4.4.
+ sRAW support in 1.393 broke Fuji DNG files, now fixed.
+ No new options introduced.
+
+0.1.4
+------------------------------------------------------------------------
+- updated dcraw to 8.83
+ new cameras: Apple QuickTake 200, Fuji IS-1, Sony DSLR-A350, Pentax K20D,
+ Nokia N95, Canon PowerShots A460, Canon PowerShots A530,
+ Canon PowerShots A650.
+ no new options introduced.
+- updated dcraw to 8.82
+ new cameras: Sony DSLR-A200, Sony DSLR-A700, Sony XCD-SX910CR, STV680 VGA
+ no new options introduced.
+
+Bugs fixed from B.K.O (http://bugs.kde.org):
+001 ==> 142055 : Which whitebalance is used.
+
0.1.3
------------------------------------------------------------------------
- updated dcraw to 8.81
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (.../tags/KDE/4.1.2/kdegraphics/libs/libkdcraw) (revision 868654)
+++ CMakeLists.txt (.../trunk/KDE/kdegraphics/libs/libkdcraw) (revision 868654)
@@ -1,21 +1,25 @@
PROJECT(libkdcraw)
+option(ENABLE_OPENMP "Build with OpenMP support to use LibRaw parallel demosaicing operation" OFF)
+
# =======================================================
# Informations to update before to release this library.
# Library version history:
-# API ABI
-# 0.1.0 => 0.1.0
-# 0.1.1 => 1.0.0
-# 0.1.2 => 2.0.0
-# 0.1.3.=> 2.1.0
-# 0.1.4 => 3.0.0
-# ... here we can have new releases from KDE3 branch
-# 0.2.0 => 5.0.0
+# API ABI
+# 0.1.0 => 0.1.0 (KDE3)
+# 0.1.1 => 1.0.0 (KDE3)
+# 0.1.2 => 2.0.0 (KDE3)
+# 0.1.3 => 2.1.0 (KDE3)
+# 0.1.4 => 3.0.0 (KDE3)
+# 0.1.5 => 4.0.0 (KDE3)
+# 0.2.0 => 5.0.0 (released with KDE 4.1.0)
+# 0.3.0 => 6.0.0 (released with KDE 4.1.2)
+# 0.4.0 => 7.0.0 (using libRaw-Released with KDE 4.2.0)
# Library API version
SET(DCRAW_LIB_MAJOR_VERSION "0")
-SET(DCRAW_LIB_MINOR_VERSION "2")
+SET(DCRAW_LIB_MINOR_VERSION "4")
SET(DCRAW_LIB_PATCH_VERSION "0")
# Suffix to add at end of version string. Usual values are:
@@ -25,44 +29,75 @@
# "-beta3" : beta3 release.
# "-rc" : release candidate.
# "" : final relase. Can be used in production.
-SET(DCRAW_LIB_SUFFIX_VERSION "-svn")
+SET(DCRAW_LIB_SUFFIX_VERSION "")
# Library ABI version used by linker.
# For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-SET(DCRAW_LIB_SO_CUR_VERSION "5")
+SET(DCRAW_LIB_SO_CUR_VERSION "7")
SET(DCRAW_LIB_SO_REV_VERSION "0")
SET(DCRAW_LIB_SO_AGE_VERSION "0")
-# dcraw.c version include with this library.
-# Look into dcraw/dcraw.c implementation for details.
-SET(DCRAW_PROGRAM_VERSION "8.86")
-
# =======================================================
# Set env. variables accordinly.
-SET(DCRAW_PROGRAM_DIR "${LIB_INSTALL_DIR}/libkdcraw${DCRAW_LIB_SO_CUR_VERSION}")
-
SET(DCRAW_LIB_VERSION_STRING "${DCRAW_LIB_MAJOR_VERSION}.${DCRAW_LIB_MINOR_VERSION}.${DCRAW_LIB_PATCH_VERSION}${DCRAW_LIB_SUFFIX_VERSION}")
SET(DCRAW_LIB_VERSION_ID "0x0${DCRAW_LIB_MAJOR_VERSION}0${DCRAW_LIB_MINOR_VERSION}0${DCRAW_LIB_PATCH_VERSION}")
SET(DCRAW_LIB_SO_VERSION_STRING "${DCRAW_LIB_SO_CUR_VERSION}.${DCRAW_LIB_SO_REV_VERSION}.${DCRAW_LIB_SO_AGE_VERSION}")
# =======================================================
+# LibRAW source code
-# Depencies detection require to compile dcraw.c
-# Detect Little CMS library properlly with CMake script from 'cmake/modules'
-FIND_PACKAGE(LCMS REQUIRED)
+IF( NOT WIN32)
+ FIND_LIBRARY(MATH_LIBRARY m)
+ENDIF( NOT WIN32 )
-# Detect libJPEG
-FIND_PACKAGE(JPEG REQUIRED)
+find_package(LCMS REQUIRED)
-SUBDIRS(icons)
-SUBDIRS(libkdcraw)
-SUBDIRS(dcraw)
-SUBDIRS(profiles)
+# Flag to compile Little CMS code from LibRaw
+ADD_DEFINITIONS(-DUSE_LCMS)
+# Flag to debug LibRaw
+ADD_DEFINITIONS(-DDCRAW_VERBOSE)
+
+# LibRaw use C++ exception.
+ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+
+# OpenMP support to use parallelized code.
+IF(ENABLE_OPENMP)
+ ADD_DEFINITIONS(-fopenmp)
+ SET(OPENMP_LDFLAGS -lgomp)
+ENDIF(ENABLE_OPENMP)
+
+# Under Windows, use specific flag to compile.
+IF( WIN32 )
+ ADD_DEFINITIONS( -DDJGPP )
+ENDIF( WIN32 )
+
+INCLUDE_DIRECTORIES(
+ ${JPEG_INCLUDE_DIR}
+ ${LCMS_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraw
+ )
+
+# Do not compile LibRaw with KDE FINAL mode.
+KDE4_NO_ENABLE_FINAL(libraw)
+
+SET(libraw_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/libraw/internal/dcraw_common.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraw/internal/foveon.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraw/src/libraw_cxx.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraw/src/libraw_c_api.cpp
+ )
+
+# =======================================================
+
IF(NOT WIN32)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.lsm)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
ENDIF(NOT WIN32)
+
+SUBDIRS(icons)
+SUBDIRS(libkdcraw)
+SUBDIRS(test)
+SUBDIRS(profiles)
Index: README
===================================================================
--- README (.../tags/KDE/4.1.2/kdegraphics/libs/libkdcraw) (revision 868654)
+++ README (.../trunk/KDE/kdegraphics/libs/libkdcraw) (revision 868654)
@@ -1,4 +1,4 @@
-DCRAW program interface for KDE
+LibRaw C++ interface for KDE
This library is a part of Kipi-Plugins project (http://www.kipi-plugins.org)
@@ -8,8 +8,8 @@
-- ABOUT -------------------------------------------------------------
-Libkdcraw is a C++ interface around dcraw binary program used to decode RAW
-picture files.
+Libkdcraw is a C++ interface around LibRaw library used to decode RAW
+picture files. More information about LibRaw can be found at http://www.libraw.org.
This library is used by kipi-plugins, digiKam and others kipi host programs.
@@ -17,12 +17,19 @@
-- DEPENDENCIES -------------------------------------------------------
-CMake >= 2.4.x http://www.cmake.org
-libqt >= 4.2.x http://www.trolltech.com
-libkde >= 4.0.x http://www.kde.org
-liblcms >= 1.14.x (used by dcraw.c) http://www.littlecms.com
-libjpeg >= 6b (used by dcraw.c) http://www.ijg.org
+CMake >= 2.4.x http://www.cmake.org
+libqt >= 4.2.x http://www.trolltech.com
+libkde >= 4.0.x http://www.kde.org
+liblcms >= 1.14.x (used by libraw) http://www.littlecms.com
+libjpeg >= 6b (used by libraw) http://www.ijg.org
+Optional:
+
+"-DENABLE_OPENMP=yes" CMake option set on parallelized LibRaw code to
+speed-up RAW demosaicing operations.
+libgomp >= 4.3.x (used by libraw) http://gcc.gnu.org/projects/gomp
+
+
-- INSTALL ------------------------------------------------------------
In order to compile, especially when QT3/Qt4 are installed at the same time,
kdegraphics-4.1.2-libkexiv2-0.4.0.patch:
--- NEW FILE kdegraphics-4.1.2-libkexiv2-0.4.0.patch ---
Index: libkexiv2/kexiv2comments.cpp
===================================================================
--- libkexiv2/kexiv2comments.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2comments.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,10 +10,6 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
@@ -47,7 +43,8 @@
catch( Exiv2::Error &e )
{
std::string s(e.what());
- qDebug("%s (Error #%i: %s)", "Cannot check Comment access mode using Exiv2 ", e.code(), s.c_str());
+ kDebug(51003) << "Cannot check Comment access mode using Exiv2 (Error #"
+ << e.code() << ": " << s.c_str() << ")" << endl;
}
return false;
Index: libkexiv2/kexiv2gps.cpp
===================================================================
--- libkexiv2/kexiv2gps.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2gps.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,20 +10,16 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// C++ includes.
@@ -185,7 +181,7 @@
Exiv2::ExifKey exifKey3("Exif.GPSInfo.GPSAltitude");
Exiv2::ExifData exifData(d->exifMetadata);
Exiv2::ExifData::iterator it = exifData.findKey(exifKey3);
- if (it != exifData.end())
+ if (it != exifData.end() && (*it).count())
{
num = (double)((*it).toRational(0).first);
den = (double)((*it).toRational(0).second);
@@ -226,7 +222,7 @@
Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLatitude");
Exiv2::ExifData exifData(d->exifMetadata);
Exiv2::ExifData::iterator it = exifData.findKey(exifKey);
- if (it != exifData.end())
+ if (it != exifData.end() && (*it).count() == 3)
{
return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,
(*it).toRational(1).first, (*it).toRational(1).second,
@@ -258,7 +254,7 @@
Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLongitude");
Exiv2::ExifData exifData(d->exifMetadata);
Exiv2::ExifData::iterator it = exifData.findKey(exifKey);
- if (it != exifData.end())
+ if (it != exifData.end() && (*it).count() == 3)
{
return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,
(*it).toRational(1).first, (*it).toRational(1).second,
@@ -276,7 +272,6 @@
return QString();
}
-
bool KExiv2::setGPSInfo(double altitude, double latitude, double longitude, bool setProgramName) const
{
if (!setProgramId(setProgramName))
@@ -425,7 +420,7 @@
// Altitude reference: byte "00" meaning "above sea level", "01" mening "behing sea level".
value = Exiv2::Value::create(Exiv2::unsignedByte);
if (altitude >= 0) value->read("0");
- else value->read("1");
+ else value->read("1");
d->exifMetadata.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"), value.get());
// And the actual altitude, as absolute value..
@@ -477,7 +472,7 @@
return false;
try
- {
+ {
QStringList gpsTagsKeys;
for (Exiv2::ExifData::iterator it = d->exifMetadata.begin();
@@ -489,7 +484,7 @@
gpsTagsKeys.append(key);
}
- for(QStringList::Iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2)
+ for(QStringList::const_iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2)
{
Exiv2::ExifKey gpsKey((*it2).toAscii().constData());
Exiv2::ExifData::iterator it3 = d->exifMetadata.findKey(gpsKey);
@@ -630,7 +625,6 @@
}
}
-
QString KExiv2::convertToGPSCoordinateString(long int numeratorDegrees, long int denominatorDegrees,
long int numeratorMinutes, long int denominatorMinutes,
long int numeratorSeconds, long int denominatorSeconds,
@@ -878,6 +872,4 @@
*seconds = coordinate;
}
-
-
} // NameSpace KExiv2Iface
Index: libkexiv2/kexiv2private.cpp
===================================================================
--- libkexiv2/kexiv2private.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2private.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -9,10 +9,6 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
@@ -35,24 +31,17 @@
KExiv2Priv::KExiv2Priv()
{
imageComments = std::string();
-
-#ifdef _XMP_SUPPORT_
- Exiv2::XmpProperties::registerNs("http://www.microsoft.com/Photo/", "MicrosoftPhoto");
-#endif
}
KExiv2Priv::~KExiv2Priv()
{
- // Fix memory leak if Exiv2 support XMP.
-#ifdef _XMP_SUPPORT_
- Exiv2::XmpParser::terminate();
-#endif // _XMP_SUPPORT_
}
void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)
{
std::string s(e.what());
- qDebug("%s (Error #%i: %s)", msg.toAscii().constData(), e.code(), s.c_str());
+ kDebug(51003) << msg.toAscii().constData() << " (Error #"
+ << e.code() << ": " << s.c_str() << endl;
}
QString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
Index: libkexiv2/kexiv2exif.cpp
===================================================================
--- libkexiv2/kexiv2exif.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2exif.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,20 +10,16 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Local includes.
@@ -47,7 +43,8 @@
catch( Exiv2::Error &e )
{
std::string s(e.what());
- qDebug("%s (Error #%i: %s)", "Cannot check Exif access mode using Exiv2 ", e.code(), s.c_str());
+ kDebug(51003) << "Cannot check Exif access mode using Exiv2 (Error #"
+ << e.code() << ": " << s.c_str() << ")" << endl;
}
return false;
@@ -106,7 +103,7 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+ kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
d->printExiv2ExceptionError("Cannot get Exif data using Exiv2 ", e);
}
@@ -134,7 +131,7 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+ kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
d->printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e);
}
@@ -743,7 +740,7 @@
if (it != exifData.end())
{
long orientation = it->toLong();
- qDebug("Exif Thumbnail Orientation: %i", (int)orientation);
+ kDebug(51003) << "Exif Thumbnail Orientation: " << (int)orientation << endl;
rotateExifQImage(thumbnail, (ImageOrientation)orientation);
}
@@ -820,7 +817,7 @@
thumbFile.setAutoRemove(true);
thumbFile.open();
thumb.save(thumbFile.fileName(), "JPEG");
- qDebug("Thumbnail temp file: %s", thumbFile.fileName().toAscii().data());
+ kDebug(51003) << "Thumbnail temp file: " << thumbFile.fileName().toAscii().data() << endl;
const std::string &fileName((const char*)(QFile::encodeName(thumbFile.fileName())));
#if (EXIV2_TEST_VERSION(0,17,91))
Index: libkexiv2/kexiv2.cpp
===================================================================
--- libkexiv2/kexiv2.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -9,10 +9,6 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
@@ -83,6 +79,25 @@
//-- Statics methods ----------------------------------------------
+bool KExiv2::initializeExiv2()
+{
+#ifdef _XMP_SUPPORT_
+ return (Exiv2::XmpParser::initialize());
+#endif // _XMP_SUPPORT_
+
+ return true;
+}
+
+bool KExiv2::cleanupExiv2()
+{
+ // Fix memory leak if Exiv2 support XMP.
+#ifdef _XMP_SUPPORT_
+ Exiv2::XmpParser::terminate();
+#endif // _XMP_SUPPORT_
+
+ return true;
+}
+
bool KExiv2::supportXmp()
{
#ifdef _XMP_SUPPORT_
@@ -92,13 +107,38 @@
#endif // _XMP_SUPPORT_
}
-bool KExiv2::supportTiffWritting()
+bool KExiv2::supportMetadataWritting(const QString& typeMime)
{
+ if (typeMime == QString("image/jpeg"))
+ {
+ return true;
+ }
+ else if (typeMime == QString("image/tiff"))
+ {
#if (EXIV2_TEST_VERSION(0,17,91))
- return true;
+ return true;
#else
+ return false;
+#endif
+ }
+ else if (typeMime == QString("image/png"))
+ {
+#if (EXIV2_TEST_VERSION(0,17,91))
+ return true;
+#else
+ return false;
+#endif
+ }
+ else if (typeMime == QString("image/jp2"))
+ {
+#if (EXIV2_TEST_VERSION(0,17,91))
+ return true;
+#else
+ return false;
+#endif
+ }
+
return false;
-#endif
}
QString KExiv2::Exiv2Version()
@@ -141,18 +181,59 @@
//-- General methods ----------------------------------------------
+bool KExiv2::load(const QByteArray& imgData) const
+{
+ if (imgData.isEmpty())
+ return false;
+
+ try
+ {
+ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((Exiv2::byte*)imgData.data(), imgData.size());
+
+ d->filePath = QString();
+ image->readMetadata();
+
+ // Image comments ---------------------------------
+
+ d->imageComments = image->comment();
+
+ // Exif metadata ----------------------------------
+
+ d->exifMetadata = image->exifData();
+
+ // Iptc metadata ----------------------------------
+
+ d->iptcMetadata = image->iptcData();
+
+#ifdef _XMP_SUPPORT_
+
+ // Xmp metadata -----------------------------------
+
+ d->xmpMetadata = image->xmpData();
+
+#endif // _XMP_SUPPORT_
+
+ return true;
+ }
+ catch( Exiv2::Error &e )
+ {
+ d->printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
+ }
+
+ return false;
+}
+
bool KExiv2::load(const QString& filePath) const
{
QFileInfo finfo(filePath);
if (filePath.isEmpty() || !finfo.isReadable())
{
- qDebug("File '%s' is not readable.", finfo.fileName().toAscii().constData());
+ kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is not readable." << endl;
return false;
}
try
{
-
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((const char*)
(QFile::encodeName(filePath)));
@@ -199,15 +280,24 @@
QFileInfo dinfo(finfo.path());
if (!finfo.isWritable())
{
- qDebug("File '%s' is read-only. Metadata not saved.", finfo.fileName().toAscii().constData());
+ kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is read-only. Metadata not saved." << endl;
return false;
}
if (!dinfo.isWritable())
{
- qDebug("Dir '%s' is read-only. Metadata not saved.", dinfo.filePath().toAscii().constData());
+ kDebug(51003) << "Dir '" << dinfo.filePath().toAscii().constData() << "' is read-only. Metadata not saved." << endl;
return false;
}
+ // TIFF/EP Raw file based supported by Exiv2 0.18 are : DNG, NEF, PEF.
+ QString rawTiffBasedNotSupported("3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf");
+ if (rawTiffBasedNotSupported.contains(finfo.suffix().toUpper()))
+ {
+ kDebug(51003) << "'" << dinfo.filePath().toAscii().constData()
+ << "' is TIFF based RAW file not yet supported. Metadata not saved." << endl;
+ return false;
+ }
+
try
{
Exiv2::AccessMode mode;
@@ -235,11 +325,12 @@
{
if (image->mimeType() == "image/tiff")
{
+ Exiv2::ExifData exif = image->exifData();
+ QStringList untouchedTags;
+
// With tiff image we cannot overwrite whole Exif data as well, because
// image data are stored in Exif container. We need to take a care about
// to not lost image data.
- Exiv2::ExifData exif = image->exifData();
- QStringList untouchedTags;
untouchedTags << "Exif.Image.ImageWidth";
untouchedTags << "Exif.Image.ImageLength";
untouchedTags << "Exif.Image.BitsPerSample";
Index: libkexiv2/kexiv2iptc.cpp
===================================================================
--- libkexiv2/kexiv2iptc.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2iptc.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,20 +10,16 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Local includes.
@@ -47,7 +43,8 @@
catch( Exiv2::Error &e )
{
std::string s(e.what());
- qDebug("%s (Error #%i: %s)", "Cannot check Iptc access mode using Exiv2 ", e.code(), s.c_str());
+ kDebug(51003) << "Cannot check Iptc access mode using Exiv2 (Error #"
+ << e.code() << ": " << s.c_str() << ")" << endl;
}
return false;
@@ -87,7 +84,7 @@
#if (EXIV2_TEST_VERSION(0,10,0))
c2 = Exiv2::Photoshop::setIptcIrb(0, 0, iptc);
#else
- qDebug("Exiv2 version is to old. Cannot add Irb header to Iptc metadata");
+ kDebug(51003) << "Exiv2 version is to old. Cannot add Irb header to Iptc metadata" << endl;
return QByteArray();
#endif
}
@@ -108,7 +105,7 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+ kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
d->printExiv2ExceptionError("Cannot get Iptc data using Exiv2 ",e);
}
@@ -136,7 +133,7 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+ kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
d->printExiv2ExceptionError("Cannot set Iptc data using Exiv2 ", e);
}
@@ -315,7 +312,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
- .arg(iptcTagName), e);
+ .arg(iptcTagName), e);
}
return QByteArray();
@@ -343,7 +340,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
- .arg(iptcTagName), e);
+ .arg(iptcTagName), e);
}
return QString();
@@ -397,7 +394,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
- .arg(iptcTagName), e);
+ .arg(iptcTagName), e);
}
return QStringList();
@@ -415,8 +412,8 @@
QStringList oldvals = oldValues;
QStringList newvals = newValues;
- qDebug() << d->filePath.toAscii().constData() << " : " << iptcTagName
- << " => " << newvals.join(",").toAscii().constData() << endl;
+ kDebug(51003) << d->filePath.toAscii().constData() << " : " << iptcTagName
+ << " => " << newvals.join(",").toAscii().constData() << endl;
// Remove all old values.
Exiv2::IptcData iptcData(d->iptcMetadata);
@@ -457,7 +454,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot set Iptc key '%1' into image using Exiv2 ")
- .arg(iptcTagName), e);
+ .arg(iptcTagName), e);
}
return false;
@@ -505,7 +502,8 @@
QStringList oldkeys = oldKeywords;
QStringList newkeys = newKeywords;
- qDebug("%s ==> Iptc Keywords: %s", d->filePath.toAscii().constData(), newkeys.join(",").toAscii().constData());
+ kDebug(51003) << d->filePath.toAscii().constData()
+ << " ==> Iptc Keywords: " << newkeys.join(",").toAscii().constData() << endl;
// Remove all old keywords.
Exiv2::IptcData iptcData(d->iptcMetadata);
@@ -518,8 +516,7 @@
// Also remove new keywords to avoid duplicates. They will be added again below.
if ( key == QString("Iptc.Application2.Keywords") &&
- (oldKeywords.contains(val) || newKeywords.contains(val))
- )
+ (oldKeywords.contains(val) || newKeywords.contains(val)) )
it = iptcData.erase(it);
else
++it;
Index: libkexiv2/kexiv2private.h
===================================================================
--- libkexiv2/kexiv2private.h (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2private.h (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -41,7 +41,6 @@
#include <QMatrix>
#include <QFileInfo>
#include <QDataStream>
-#include <QDebug>
// KDE includes.
@@ -49,6 +48,7 @@
#include <kencodingdetector.h>
#include <kstringhandler.h>
#include <kdeversion.h>
+#include <kdebug.h>
// Exiv2 includes.
Index: libkexiv2/kexiv2image.cpp
===================================================================
--- libkexiv2/kexiv2image.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2image.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,20 +10,16 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Local includes.
@@ -236,7 +232,7 @@
if (it != exifData.end())
{
orientation = it->toLong();
- qDebug() << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;
+ kDebug(51003) << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;
switch(orientation)
{
case 76:
@@ -255,7 +251,7 @@
if (it != exifData.end())
{
orientation = it->toLong();
- qDebug() << "Orientation => Exif.MinoltaCs5D.Rotation => " << (int)orientation << endl;
+ kDebug(51003) << "Orientation => Exif.MinoltaCs5D.Rotation => " << (int)orientation << endl;
switch(orientation)
{
case 76:
@@ -276,7 +272,7 @@
if (it != exifData.end())
{
orientation = it->toLong();
- qDebug() << "Orientation => Exif.Image.Orientation => " << (int)orientation << endl;
+ kDebug(51003) << "Orientation => Exif.Image.Orientation => " << (int)orientation << endl;
return (ImageOrientation)orientation;
}
@@ -291,7 +287,7 @@
orientation = str.toLong(&ok);
if (ok)
{
- qDebug() << "Orientation => Xmp.tiff.Orientation => " << (int)orientation << endl;
+ kDebug(51003) << "Orientation => Xmp.tiff.Orientation => " << (int)orientation << endl;
return (ImageOrientation)orientation;
}
}
@@ -316,14 +312,14 @@
{
if (orientation < ORIENTATION_UNSPECIFIED || orientation > ORIENTATION_ROT_270)
{
- qDebug("Image orientation value is not correct!");
+ kDebug(51003) << "Image orientation value is not correct!" << endl;
return false;
}
// Set Exif values.
d->exifMetadata["Exif.Image.Orientation"] = static_cast<uint16_t>(orientation);
- qDebug() << "Exif.Image.Orientation tag set to: " << (int)orientation;
+ kDebug(51003) << "Exif.Image.Orientation tag set to: " << (int)orientation << endl;
// Set Xmp values.
@@ -345,7 +341,7 @@
if (it != d->exifMetadata.end())
{
d->exifMetadata.erase(it);
- qDebug("Removing Exif.MinoltaCs7D.Rotation tag");
+ kDebug(51003) << "Removing Exif.MinoltaCs7D.Rotation tag" << endl;
}
Exiv2::ExifKey minoltaKey2("Exif.MinoltaCs5D.Rotation");
@@ -353,7 +349,7 @@
if (it != d->exifMetadata.end())
{
d->exifMetadata.erase(it);
- qDebug("Removing Exif.MinoltaCs5D.Rotation tag");
+ kDebug(51003) << "Removing Exif.MinoltaCs5D.Rotation tag" << endl;
}
return true;
@@ -485,7 +481,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Exif.Photo.DateTimeOriginal => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Exif.Photo.DateTimeOriginal => " << dateTime << endl;
return dateTime;
}
}
@@ -498,7 +494,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Exif.Photo.DateTimeDigitized => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Exif.Photo.DateTimeDigitized => " << dateTime << endl;
return dateTime;
}
}
@@ -511,7 +507,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Exif.Image.DateTime => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Exif.Image.DateTime => " << dateTime << endl;
return dateTime;
}
}
@@ -533,7 +529,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.exif.DateTimeOriginal => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.exif.DateTimeOriginal => " << dateTime << endl;
return dateTime;
}
}
@@ -546,7 +542,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.exif.DateTimeDigitized => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.exif.DateTimeDigitized => " << dateTime << endl;
return dateTime;
}
}
@@ -559,7 +555,7 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.photoshop.DateCreated => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.photoshop.DateCreated => " << dateTime << endl;
return dateTime;
}
}
@@ -572,10 +568,10 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.xmp.CreateDate => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.xmp.CreateDate => " << dateTime << endl;
return dateTime;
}
- }
+ }
}
{
Exiv2::XmpKey key("Xmp.tiff.DateTime");
@@ -585,10 +581,10 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.tiff.DateTime => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.tiff.DateTime => " << dateTime << endl;
return dateTime;
}
- }
+ }
}
{
Exiv2::XmpKey key("Xmp.xmp.ModifyDate");
@@ -598,10 +594,10 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.xmp.ModifyDate => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.xmp.ModifyDate => " << dateTime << endl;
return dateTime;
}
- }
+ }
}
{
Exiv2::XmpKey key("Xmp.xmp.MetadataDate");
@@ -611,10 +607,10 @@
QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Xmp.xmp.MetadataDate => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Xmp.xmp.MetadataDate => " << dateTime << endl;
return dateTime;
}
- }
+ }
}
}
@@ -643,7 +639,7 @@
QDateTime dateTime = QDateTime(date, time);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Iptc.Application2.DateCreated => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Iptc.Application2.DateCreated => " << dateTime << endl;
return dateTime;
}
}
@@ -666,7 +662,7 @@
QDateTime dateTime = QDateTime(date, time);
if (dateTime.isValid())
{
- qDebug() << "DateTime => Iptc.Application2.DigitizationDate => " << dateTime << endl;
+ kDebug(51003) << "DateTime => Iptc.Application2.DigitizationDate => " << dateTime << endl;
return dateTime;
}
}
@@ -708,7 +704,7 @@
// In second we write date & time into Xmp.
- const std::string &xmpdatetime(dateTime.toString(QString("yyyy:MM:dd hh:mm:ss")).toAscii().constData());
+ const std::string &xmpdatetime(dateTime.toString(Qt::ISODate).toAscii().constData());
Exiv2::Value::AutoPtr xmpTxtVal = Exiv2::Value::create(Exiv2::xmpText);
xmpTxtVal->read(xmpdatetime);
@@ -769,7 +765,7 @@
if (dateTime.isValid())
{
- // qDebug("DateTime (Exif digitalized): %s", dateTime.toString().toAscii().constData());
+ kDebug(51003) << "DateTime (Exif digitalized): " << dateTime.toString().toAscii().constData() << endl;
return dateTime;
}
}
@@ -804,7 +800,7 @@
if (dateTime.isValid())
{
- //qDebug("Date (IPTC digitalized): %s", dateTime.toString().toAscii().constData());
+ kDebug(51003) << "Date (IPTC digitalized): " << dateTime.toString().toAscii().constData() << endl;
return dateTime;
}
}
@@ -857,9 +853,8 @@
// A little bit compressed preview jpeg image to limit IPTC size.
preview.save(previewFile.fileName(), "JPEG");
- qDebug("JPEG image preview size: (%i x %i) pixels - %i bytes",
- preview.width(), preview.height(),
- (int)previewFile.size());
+ kDebug(51003) << "JPEG image preview size: (" << preview.width() << " x "
+ << preview.height() << ") pixels - " << (int)previewFile.size() << " bytes" << endl;
QByteArray data;
data.resize(previewFile.size());
Index: libkexiv2/CMakeLists.txt
===================================================================
--- libkexiv2/CMakeLists.txt (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/CMakeLists.txt (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -1,7 +1,9 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
INCLUDE_DIRECTORIES(${EXIV2_INCLUDE_DIR})
+ADD_DEFINITIONS(${EXIV2_DEFINITIONS})
+ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
# This was used to enable catching of exceptions thrown by libexiv2.
@@ -20,7 +22,7 @@
KDE4_ADD_LIBRARY(kexiv2 SHARED ${kexiv2_LIB_SRCS})
-TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} exiv2)
+TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${EXIV2_LIBRARIES})
IF( WIN32 )
TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} )
Index: libkexiv2/kexiv2.h
===================================================================
--- libkexiv2/kexiv2.h (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2.h (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -118,13 +118,27 @@
//-- STATICS methods ----------------------------------------------
//-----------------------------------------------------------------
+ /** Return true if Exiv2 library initialization is done properlly.
+ This method must be call before to use multithreading with libkexiv2.
+ It initialize several non re-entrancy code from Adobe XMP SDK
+ See B.K.O #166424 for details.
+ */
+ static bool initializeExiv2();
+
+ /** Return true if Exiv2 library memory allocations are cleaned properlly.
+ This method must be call after to use multithreading with libkexiv2.
+ It cleanup memory used by Adobe XMP SDK
+ See B.K.O #166424 for details.
+ */
+ static bool cleanupExiv2();
+
/** Return true if library can handle Xmp metadata
*/
static bool supportXmp();
- /** Return true if library can writte metadata to TIFF/DNG files
+ /** Return true if library can writte metadata to typeMime file format.
*/
- static bool supportTiffWritting();
+ static bool supportMetadataWritting(const QString& typeMime);
/** Return a string version of Exiv2 release in format "major.minor.patch"
*/
@@ -142,6 +156,11 @@
//-- GENERAL methods ----------------------------------------------
//-----------------------------------------------------------------
+ /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a byte array.
+ Return true if metadata have been loaded successfully from image data.
+ */
+ bool load(const QByteArray& imgData) const;
+
/** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a picture (JPEG, RAW, TIFF, PNG,
DNG, etc...). Return true if metadata have been loaded successfully from file.
*/
Index: libkexiv2/kexiv2xmp.cpp
===================================================================
--- libkexiv2/kexiv2xmp.cpp (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ libkexiv2/kexiv2xmp.cpp (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -10,20 +10,16 @@
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
*
- * NOTE: Do not use kdDebug() in this implementation because
- * it will be multithreaded. Use qDebug() instead.
- * See B.K.O #133026 for details.
- *
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Local includes.
@@ -48,7 +44,8 @@
catch( Exiv2::Error &e )
{
std::string s(e.what());
- qDebug("%s (Error #%i: %s)", "Cannot check Xmp access mode using Exiv2 ", e.code(), s.c_str());
+ kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #"
+ << e.code() << ": " << s.c_str() << ")" << endl;
}
return false;
@@ -110,8 +107,8 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+
d->printExiv2ExceptionError("Cannot get Xmp data using Exiv2 ", e);
}
@@ -140,7 +137,7 @@
catch( Exiv2::Error &e )
{
if (!d->filePath.isEmpty())
- qDebug ("From file %s", d->filePath.toAscii().constData());
+ kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e);
}
@@ -299,7 +296,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -355,7 +352,7 @@
QString text = QString::fromUtf8(it2->second.c_str());
if (escapeCR)
text.replace("\n", " ");
-
+
map.insert(lang, text);
}
@@ -366,7 +363,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -388,7 +385,7 @@
removeXmpTag(xmpTagName);
Exiv2::Value::AutoPtr xmpTxtVal = Exiv2::Value::create(Exiv2::langAlt);
-
+
for (AltLangMap::const_iterator it = values.begin(); it != values.end(); ++it)
{
QString lang = it.key();
@@ -435,7 +432,7 @@
{
if (escapeCR)
tagValue.replace("\n", " ");
-
+
return tagValue;
}
}
@@ -445,7 +442,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -484,7 +481,7 @@
{
const std::string &val((*it).toUtf8().constData());
xmpTxtVal->read(val);
- qDebug() << *it << endl;
+ kDebug(51003) << *it << endl;
}
}
}
@@ -524,13 +521,13 @@
std::ostringstream os;
os << it->toString(i);
QString seqValue = QString::fromUtf8(os.str().c_str());
-
+
if (escapeCR)
seqValue.replace("\n", " ");
seq.append(seqValue);
}
- qDebug() << "XMP String Seq (" << xmpTagName << "): " << seq << endl;
+ kDebug(51003) << "XMP String Seq (" << xmpTagName << "): " << seq << endl;
return seq;
}
@@ -539,7 +536,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -560,7 +557,7 @@
QStringList list = seq;
Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
- for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it )
{
const std::string &txt((*it).toUtf8().constData());
xmpTxtSeq->read(txt);
@@ -598,7 +595,7 @@
std::ostringstream os;
os << it->toString(i);
QString bagValue = QString::fromUtf8(os.str().c_str());
-
+
if (escapeCR)
bagValue.replace("\n", " ");
@@ -612,7 +609,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -633,7 +630,7 @@
QStringList list = bag;
Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
- for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it )
{
const std::string &txt((*it).toUtf8().constData());
xmpTxtBag->read(txt);
@@ -748,7 +745,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
- .arg(xmpTagName), e);
+ .arg(xmpTagName), e);
}
#endif // _XMP_SUPPORT_
@@ -797,7 +794,7 @@
catch( Exiv2::Error &e )
{
d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e);
- }
+ }
#endif // _XMP_SUPPORT_
@@ -818,9 +815,9 @@
QStringList oldkeys = getXmpKeywords();
QStringList newkeys = newKeywords;
-
+
// Create a list of keywords including old one witch already exists.
- for (QStringList::Iterator it = oldkeys.begin(); it != oldkeys.end(); ++it )
+ for (QStringList::const_iterator it = oldkeys.begin(); it != oldkeys.end(); ++it )
{
if (!newkeys.contains(*it))
newkeys.append(*it);
@@ -848,9 +845,9 @@
QStringList oldSubCat = getXmpSubCategories();
QStringList newSubCat = newSubCategories;
-
+
// Create a list of sub-categories including old one witch already exists.
- for (QStringList::Iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it )
+ for (QStringList::const_iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it )
{
if (!newSubCat.contains(*it))
newSubCat.append(*it);
@@ -878,9 +875,9 @@
QStringList oldSubjectCodes = getXmpSubjects();
QStringList newSubjectCodes = newSubjects;
-
+
// Create a list of sub-categories including old one witch already exists.
- for (QStringList::Iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it )
+ for (QStringList::const_iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it )
{
if (!newSubjectCodes.contains(*it))
newSubjectCodes.append(*it);
Index: TODO
===================================================================
--- TODO (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ TODO (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -1,3 +1,3 @@
- Extract GPS info from XMP tags.
-- Exif/Iptc => Xmp synchrosization.
+- Exif/Iptc => Xmp synchronization.
- Xmp side-car file support.
Index: NEWS
===================================================================
--- NEWS (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ NEWS (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -1,9 +1,27 @@
-0.2.0
+0.4.0 -
+
+- Use kDebug(51003) instead qDebug()
+
+0.3.0 - Released with KDE 4.1.2
------------------------------------------------------------------------
+
+- API changed: Added 2 new static methods to init and clear non re-entrant Adobe XMP
+ SDK code from Exiv2 core. This code must be called before and after
+ all multithreaded operations with KExiv2.
+ * initializeExiv2().
+ * cleanupExiv2().
+ Added a new method to load image data from a byte array.
+
+Bugs fixed from B.K.O (http://bugs.kde.org):
+001 ==> 166424: Crash when editing Caption with Digikam4 SVN.
+
+0.2.0 - Released with KDE 4.1.0
+------------------------------------------------------------------------
Port to CMake/KDE4/QT4
Support of XMP metadata (require Exiv2 0.16)
Split methods to separate files to provide a more readable implementation.
New method to fix orientation of a QImage accordingly with Exif orientation tag.
+Moved from extragear/libs to kdegraphics/libs
Bugs fixed from B.K.O (http://bugs.kde.org):
001 ==> 146864: Lesser XMP support in digiKam.
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ CMakeLists.txt (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -15,11 +15,13 @@
# 0.1.7 => 4.0.1
# 0.1.8 => 5.0.0
# ... here we can have new releases from KDE3 branch
-# 0.2.0 => 6.0.0
+# 0.2.0 => 6.0.0 (released with KDE 4.1.0)
+# 0.3.0 => 7.0.0 (released with KDE 4.1.2)
+# 0.4.0 => 7.1.0
# Library API version
SET(KEXIV2_LIB_MAJOR_VERSION "0")
-SET(KEXIV2_LIB_MINOR_VERSION "2")
+SET(KEXIV2_LIB_MINOR_VERSION "4")
SET(KEXIV2_LIB_PATCH_VERSION "0")
# Suffix to add at end of version string. Usual values are:
@@ -29,12 +31,12 @@
# "-beta3" : beta3 release.
# "-rc" : release candidate.
# "" : final relase. Can be used in production.
-SET(KEXIV2_LIB_SUFFIX_VERSION "-svn")
+SET(KEXIV2_LIB_SUFFIX_VERSION "")
# Library ABI version used by linker.
# For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-SET(KEXIV2_LIB_SO_CUR_VERSION "6")
-SET(KEXIV2_LIB_SO_REV_VERSION "0")
+SET(KEXIV2_LIB_SO_CUR_VERSION "7")
+SET(KEXIV2_LIB_SO_REV_VERSION "1")
SET(KEXIV2_LIB_SO_AGE_VERSION "0")
# =======================================================
Index: README
===================================================================
--- README (.../tags/KDE/4.1.2/kdegraphics/libs/libkexiv2) (revision 868653)
+++ README (.../trunk/KDE/kdegraphics/libs/libkexiv2) (revision 868653)
@@ -17,10 +17,10 @@
-- DEPENDENCIES -------------------------------------------------------
-CMake >= 2.4.x http://www.cmake.org
-libqt >= 4.2.x http://www.trolltech.com
-libkde >= 4.0.x http://www.kde.org
-libexiv2 >= 0.12 (0.17 recommended) http://www.exiv2.org
+CMake >= 2.4.x http://www.cmake.org
+libqt >= 4.2.x http://www.trolltech.com
+libkde >= 4.0.x http://www.kde.org
+libexiv2 >= 0.13 (0.18 recommended) http://www.exiv2.org
Note: Exiv2 >= 0.16 is require to handle XMP metadata.
Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdegraphics.spec 29 Sep 2008 16:33:13 -0000 1.170
+++ kdegraphics.spec 6 Oct 2008 21:04:49 -0000 1.171
@@ -6,7 +6,7 @@
Summary: K Desktop Environment - Graphics Applications
Epoch: 7
Version: 4.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Name: kdegraphics
#Obsoletes: kdegraphics4 < %{version}-%{release}
@@ -20,6 +20,15 @@
## upstream patches
+## kipi framework backports from trunk (4.2)
+## don't bother updating these, rediff them from the next tag instead!
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkexiv2 \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.2-libkexiv2-0.4.0.patch
+Patch200: kdegraphics-4.1.2-libkexiv2-0.4.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkdcraw \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.2-libkdcraw-0.4.0.patch
+Patch201: kdegraphics-4.1.2-libkdcraw-0.4.0.patch
+
BuildRequires: kde-filesystem >= 4
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: cmake
@@ -82,8 +91,8 @@
Requires: kdelibs4-devel
Requires: pkgconfig
%if ! 0%{?omit_kde3_conflicts}
-Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0
-Provides: libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
+Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
+Provides: libkdcraw-devel = 0.4.0, libkexiv2-devel = 0.4.0, libkipi-devel = 0.2.0
%endif
%description devel
%{summary}.
@@ -93,6 +102,15 @@
%setup -q -n kdegraphics-%{version}
# upstream patches
+# libkexiv2 0.4.0 backport
+pushd libs/libkexiv2
+%patch200 -p0
+popd
+# libkdcraw 0.4.0 backport
+pushd libs/libkdcraw
+%patch201 -p0
+popd
+
%build
@@ -184,6 +202,10 @@
%changelog
+* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-3
+- respun tarball
+- backport latest libkexiv2 and libkdcraw from trunk
+
* Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 26 Sep 2008 23:48:45 -0000 1.57
+++ sources 6 Oct 2008 21:04:49 -0000 1.58
@@ -1 +1 @@
-210e3a98485c2da91aaab69b9047837b kdegraphics-4.1.2.tar.bz2
+f29e68dfe91cc0d2a5fbe2e4f7920054 kdegraphics-4.1.2.tar.bz2
- Previous message: rpms/kdegraphics/F-10 kdegraphics-4.1.2-libkdcraw-0.4.0.patch, NONE, 1.1 kdegraphics-4.1.2-libkexiv2-0.4.0.patch, NONE, 1.1 kdegraphics.spec, 1.170, 1.171 sources, 1.57, 1.58
- Next message: rpms/ecl/F-8 ecl.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list