Hello community, here is the log from the commit of package libkexiv2 for openSUSE:Factory checked in at 2015-05-11 19:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkexiv2 (Old) and /work/SRC/openSUSE:Factory/.libkexiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkexiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkexiv2/libkexiv2.changes 2015-03-11 09:53:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkexiv2.new/libkexiv2.changes 2015-05-11 19:21:10.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:25:00 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:22:15 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:51:08 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- libkexiv2-14.12.3.tar.xz New: ---- libkexiv2-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkexiv2.spec ++++++ --- /var/tmp/diff_new_pack.oBCglW/_old 2015-05-11 19:21:10.000000000 +0200 +++ /var/tmp/diff_new_pack.oBCglW/_new 2015-05-11 19:21:10.000000000 +0200 @@ -19,7 +19,7 @@ %define _so 11 Name: libkexiv2 -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Library to manipulate picture meta data License: GPL-2.0+ ++++++ libkexiv2-14.12.3.tar.xz -> libkexiv2-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/CMakeLists.txt new/libkexiv2-15.04.0/CMakeLists.txt --- old/libkexiv2-14.12.3/CMakeLists.txt 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/CMakeLists.txt 2015-02-22 08:00:48.000000000 +0100 @@ -1,48 +1,30 @@ -# =========================================================== # -# This file is a part of digiKam project -# <a href="http://www.digikam.org";>http://www.digikam.org</a> +# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com> # -# @date 2006-09-15 -# @brief Exiv2 library interface for KDE -# -# @author Copyright (C) 2006-2014 by Gilles Caulier -# <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> -# -# 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. -# -# ============================================================ +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -PROJECT(libkexiv2) +project(libkexiv2) -MESSAGE(STATUS "----------------------------------------------------------------------------------") -MESSAGE(STATUS "Starting CMake configuration for: libkexiv2") +message(STATUS "----------------------------------------------------------------------------------") +message(STATUS "Starting CMake configuration for: libkexiv2") -FIND_PACKAGE(KDE4 REQUIRED) +find_package(KDE4 REQUIRED) -INCLUDE(KDE4Defaults) -INCLUDE(MacroLibrary) -INCLUDE(MacroOptionalAddSubdirectory) -INCLUDE(MacroOptionalFindPackage) -INCLUDE(FindPackageHandleStandardArgs) +include(KDE4Defaults) +include(MacroLibrary) +include(MacroOptionalAddSubdirectory) +include(MacroOptionalFindPackage) +include(FindPackageHandleStandardArgs) -ADD_DEFINITIONS (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) -INCLUDE_DIRECTORIES (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) +add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) +include_directories(${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) -SET(LIBKEXIV2_AREA_CODE_GENERAL 51003) -ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKEXIV2_AREA_CODE_GENERAL}) +set(LIBKEXIV2_AREA_CODE_GENERAL 51003) +add_definitions(-DKDE_DEFAULT_DEBUG_AREA=${LIBKEXIV2_AREA_CODE_GENERAL}) -SET(EXIV2_MIN_VERSION "0.24") -FIND_PACKAGE(Exiv2) +set(EXIV2_MIN_VERSION "0.24") +find_package(Exiv2) MACRO_LOG_FEATURE(EXIV2_FOUND "Exiv2" "Required to build libkexiv2." "http://www.exiv2.org"; TRUE ${EXIV2_MIN_VERSION} "") @@ -77,9 +59,9 @@ # 2.4.0 => 11.3.0 - Add new method to access on text edit widget from AltLangStrEdit. # Library API version -SET(KEXIV2_LIB_MAJOR_VERSION "2") -SET(KEXIV2_LIB_MINOR_VERSION "4") -SET(KEXIV2_LIB_PATCH_VERSION "0") +set(KEXIV2_LIB_MAJOR_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: # "-git" : alpha code unstable from git. Do not use in production @@ -88,53 +70,52 @@ # "-beta3" : beta3 release. # "-rc" : release candidate. # "" : final relase. Can be used in production. -SET(KEXIV2_LIB_SUFFIX_VERSION "") +set(KEXIV2_LIB_SUFFIX_VERSION "") # Library ABI version used by linker. # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -SET(KEXIV2_LIB_SO_CUR_VERSION "11") -SET(KEXIV2_LIB_SO_REV_VERSION "3") -SET(KEXIV2_LIB_SO_AGE_VERSION "0") +set(KEXIV2_LIB_SO_CUR_VERSION "11") +set(KEXIV2_LIB_SO_REV_VERSION "3") +set(KEXIV2_LIB_SO_AGE_VERSION "0") # ======================================================= # Set env. variables accordinly. -SET(KEXIV2_LIB_VERSION_STRING "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}${KEXIV2_LIB_SUFFIX_VERSION}") -SET(KEXIV2_LIB_VERSION_ID "0x0${KEXIV2_LIB_MAJOR_VERSION}0${KEXIV2_LIB_MINOR_VERSION}0${KEXIV2_LIB_PATCH_VERSION}") -SET(KEXIV2_LIB_SO_VERSION_STRING "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}") +set(KEXIV2_LIB_VERSION_STRING "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}${KEXIV2_LIB_SUFFIX_VERSION}") +set(KEXIV2_LIB_VERSION_ID "0x0${KEXIV2_LIB_MAJOR_VERSION}0${KEXIV2_LIB_MINOR_VERSION}0${KEXIV2_LIB_PATCH_VERSION}") +set(KEXIV2_LIB_SO_VERSION_STRING "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}") # ======================================================= -IF (EXIV2_FOUND) - ADD_SUBDIRECTORY(libkexiv2) +if(EXIV2_FOUND) + + add_subdirectory(libkexiv2) + + if(KDE4_BUILD_TESTS) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(tests) + endif() + + include(CMakePackageConfigHelpers) + + CONFIGURE_PACKAGE_CONFIG_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libkexiv2-config.cmake.in libkexiv2-config.cmake + INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}" + PATH_VARS INCLUDE_INSTALL_DIR + NO_CHECK_REQUIRED_COMPONENTS_MACRO) + + WRITE_BASIC_PACKAGE_VERSION_FILE(libkexiv2-config-version.cmake + VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}" + COMPATIBILITY SameMajorVersion) + install(EXPORT Libkexiv2 + DESTINATION "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}" + NAMESPACE Libkexiv2:: + FILE libkexiv2-export.cmake) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-config-version.cmake + DESTINATION + "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}") - IF(KDE4_BUILD_TESTS) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(tests) - ENDIF(KDE4_BUILD_TESTS) - - INCLUDE(CMakePackageConfigHelpers) - CONFIGURE_PACKAGE_CONFIG_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libkexiv2-config.cmake.in libkexiv2-config.cmake - INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}" - PATH_VARS INCLUDE_INSTALL_DIR - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - WRITE_BASIC_PACKAGE_VERSION_FILE(libkexiv2-config-version.cmake - VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}" - COMPATIBILITY SameMajorVersion) - INSTALL(EXPORT Libkexiv2 - DESTINATION "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}" - NAMESPACE Libkexiv2:: - FILE libkexiv2-export.cmake) - INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-config-version.cmake - DESTINATION - "${LIB_INSTALL_DIR}/cmake/libkexiv2-${KEXIV2_LIB_VERSION_STRING}" - ) - IF(NOT WIN32) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libkexiv2.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libkexiv2.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.lsm) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - ENDIF(NOT WIN32) -ENDIF (EXIV2_FOUND) +endif() MACRO_DISPLAY_FEATURE_LOG() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/cmake/templates/libkexiv2-config.cmake.in new/libkexiv2-15.04.0/cmake/templates/libkexiv2-config.cmake.in --- old/libkexiv2-14.12.3/cmake/templates/libkexiv2-config.cmake.in 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/cmake/templates/libkexiv2-config.cmake.in 2015-02-22 08:00:48.000000000 +0100 @@ -1,8 +1,9 @@ @PACKAGE_INIT@ set_and_check(libkexiv2_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIR@) + if(NOT TARGET Libkexiv2::kexiv2) - include(${CMAKE_CURRENT_LIST_DIR}/libkexiv2-export.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/libkexiv2-export.cmake) endif() -set(libkexiv2_LIBRARY Libkexiv2::kexiv2) +set(libkexiv2_LIBRARY Libkexiv2::kexiv2) set(libkexiv2_LIBRARIES ${libkexiv2_LIBRARY}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/libkexiv2/CMakeLists.txt new/libkexiv2-15.04.0/libkexiv2/CMakeLists.txt --- old/libkexiv2-14.12.3/libkexiv2/CMakeLists.txt 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/libkexiv2/CMakeLists.txt 2015-02-22 08:00:48.000000000 +0100 @@ -1,43 +1,25 @@ -# =========================================================== # -# This file is a part of digiKam project -# <a href="http://www.digikam.org";>http://www.digikam.org</a> +# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com> # -# @date 2006-09-15 -# @brief Exiv2 library interface for KDE -# -# @author Copyright (C) 2006-2014 by Gilles Caulier -# <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> -# -# 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. -# -# ============================================================ +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -INCLUDE_DIRECTORIES(${EXIV2_INCLUDE_DIR}) +include_directories(${EXIV2_INCLUDE_DIR}) -ADD_DEFINITIONS(${EXIV2_DEFINITIONS}) -ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS}) +add_definitions(${EXIV2_DEFINITIONS}) +add_definitions(${KDE4_ENABLE_EXCEPTIONS}) -IF( WIN32 ) - ADD_DEFINITIONS( -DEXV_HAVE_DLL ) -ENDIF( WIN32 ) +if(WIN32) + add_definitions(-DEXV_HAVE_DLL) +endif() -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) # This was used to enable catching of exceptions thrown by libexiv2. # We use now #pragma GCC visibility push(default) around the headers #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") -SET(kexiv2_LIB_SRCS kexiv2.cpp +set(kexiv2_LIB_SRCS kexiv2.cpp kexiv2_p.cpp kexiv2image.cpp kexiv2comments.cpp @@ -55,23 +37,24 @@ KDE4_ADD_LIBRARY(kexiv2 SHARED ${kexiv2_LIB_SRCS}) -TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} +target_link_libraries(kexiv2 ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${EXIV2_LIBRARIES}) -IF( WIN32 ) +if(WIN32) TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} ) -ENDIF( WIN32 ) +endif() -SET_TARGET_PROPERTIES(kexiv2 PROPERTIES VERSION ${KEXIV2_LIB_SO_VERSION_STRING} +set_target_properties(kexiv2 PROPERTIES VERSION ${KEXIV2_LIB_SO_VERSION_STRING} SOVERSION ${KEXIV2_LIB_SO_CUR_VERSION}) -INSTALL(TARGETS kexiv2 EXPORT Libkexiv2 ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kexiv2 EXPORT Libkexiv2 ${INSTALL_TARGETS_DEFAULT_ARGS} ) -INSTALL(FILES topicset.iptc-subjectcode.xml DESTINATION ${DATA_INSTALL_DIR}/libkexiv2/data) +install(FILES topicset.iptc-subjectcode.xml DESTINATION ${DATA_INSTALL_DIR}/libkexiv2/data) # Check if compilation is done through digiKam SC or not. If yes, do not install header files. -IF(NOT DIGIKAMSC_USE_PRIVATE_SHAREDLIBS) - INSTALL(FILES kexiv2.h +if(NOT DIGIKAMSC_COMPILE_LIBKEXIV2) + + install(FILES kexiv2.h kexiv2data.h kexiv2previews.h libkexiv2_export.h @@ -84,4 +67,11 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/libkexiv2 COMPONENT Devel ) -ENDIF() + + if(NOT WIN32) + configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkexiv2.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc) + configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkexiv2.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.lsm) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + endif() + +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/libkexiv2/kexiv2exif.cpp new/libkexiv2-15.04.0/libkexiv2/kexiv2exif.cpp --- old/libkexiv2-14.12.3/libkexiv2/kexiv2exif.cpp 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/libkexiv2/kexiv2exif.cpp 2015-02-22 08:00:48.000000000 +0100 @@ -931,7 +931,7 @@ { QMatrix matrix = RotationMatrix::toMatrix(orientation); - if ((orientation != ORIENTATION_NORMAL) || (orientation != ORIENTATION_UNSPECIFIED)) + if ((orientation != ORIENTATION_NORMAL) && (orientation != ORIENTATION_UNSPECIFIED)) { image = image.transformed(matrix); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/libkexiv2/kexiv2previews.cpp new/libkexiv2-15.04.0/libkexiv2/kexiv2previews.cpp --- old/libkexiv2-14.12.3/libkexiv2/kexiv2previews.cpp 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/libkexiv2/kexiv2previews.cpp 2015-02-22 08:00:48.000000000 +0100 @@ -164,14 +164,14 @@ QString KExiv2Previews::mimeType(int index) { - if (index < 0 || index >= size()) return 0; + if (index < 0 || index >= size()) return QString(); return QString::fromLatin1(d->properties[index].mimeType_.c_str()); } QString KExiv2Previews::fileExtension(int index) { - if (index < 0 || index >= size()) return 0; + if (index < 0 || index >= size()) return QString(); return QString::fromLatin1(d->properties[index].extension_.c_str()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/libkexiv2/rotationmatrix.cpp new/libkexiv2-15.04.0/libkexiv2/rotationmatrix.cpp --- old/libkexiv2-14.12.3/libkexiv2/rotationmatrix.cpp 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/libkexiv2/rotationmatrix.cpp 2015-02-22 08:00:48.000000000 +0100 @@ -7,7 +7,7 @@ * @date 2009-08-03 * @brief Tools for combining rotation operations * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2015 by Gilles Caulier * <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> * @author Copyright (C) 2004-2012 by Marcel Wiesweg * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> @@ -65,9 +65,9 @@ (I did not proof that mathematically, but empirically) static const RotationMatrix identity; //( 1, 0, 0, 1) - static const RotationMatrix rotate90; //( 0, -1, 1, 0) + static const RotationMatrix rotate90; //( 0, 1, -1, 0) static const RotationMatrix rotate180; //(-1, 0, 0, -1) - static const RotationMatrix rotate270; //( 0, 1, -1, 0) + static const RotationMatrix rotate270; //( 0, -1, 1, 0) static const RotationMatrix flipHorizontal; //(-1, 0, 0, 1) static const RotationMatrix flipVertical; //( 1, 0, 0, -1) static const RotationMatrix rotate90flipHorizontal; //( 0, 1, 1, 0), first rotate, then flip @@ -79,9 +79,9 @@ { static const RotationMatrix identity ( 1, 0, 0, 1); -static const RotationMatrix rotate90 ( 0, -1, 1, 0); +static const RotationMatrix rotate90 ( 0, 1, -1, 0); static const RotationMatrix rotate180 (-1, 0, 0, -1); -static const RotationMatrix rotate270 ( 0, 1, -1, 0); +static const RotationMatrix rotate270 ( 0, -1, 1, 0); static const RotationMatrix flipHorizontal (-1, 0, 0, 1); static const RotationMatrix flipVertical ( 1, 0, 0, -1); static const RotationMatrix rotate90flipHorizontal ( 0, 1, 1, 0); @@ -104,6 +104,7 @@ case RotationMatrix::Rotate270: return rotate270; } + return identity; } @@ -130,6 +131,7 @@ case KExiv2::ORIENTATION_UNSPECIFIED: return identity; } + return identity; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/libkexiv2/rotationmatrix.h new/libkexiv2-15.04.0/libkexiv2/rotationmatrix.h --- old/libkexiv2-14.12.3/libkexiv2/rotationmatrix.h 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/libkexiv2/rotationmatrix.h 2015-02-22 08:00:48.000000000 +0100 @@ -7,7 +7,7 @@ * @date 2009-08-03 * @brief Tools for combining rotation operations * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2015 by Gilles Caulier * <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> * @author Copyright (C) 2004-2012 by Marcel Wiesweg * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkexiv2-14.12.3/tests/CMakeLists.txt new/libkexiv2-15.04.0/tests/CMakeLists.txt --- old/libkexiv2-14.12.3/tests/CMakeLists.txt 2014-10-30 23:07:39.000000000 +0100 +++ new/libkexiv2-15.04.0/tests/CMakeLists.txt 2015-02-22 08:00:48.000000000 +0100 @@ -1,53 +1,35 @@ -# =========================================================== # -# This file is a part of digiKam project -# <a href="http://www.digikam.org";>http://www.digikam.org</a> +# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com> # -# @date 2006-09-15 -# @brief Exiv2 library interface for KDE -# -# @author Copyright (C) 2006-2012 by Gilles Caulier -# <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> -# -# 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. -# -# ============================================================ +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libkexiv2) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libkexiv2) -SET(setiptcpreview_SRCS setiptcpreview.cpp) +set(setiptcpreview_SRCS setiptcpreview.cpp) KDE4_ADD_EXECUTABLE(setiptcpreview NOGUI ${setiptcpreview_SRCS}) -TARGET_LINK_LIBRARIES(setiptcpreview kexiv2 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +target_link_libraries(setiptcpreview kexiv2 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -SET(loadfromba_SRCS loadfromba.cpp) +set(loadfromba_SRCS loadfromba.cpp) KDE4_ADD_EXECUTABLE(loadfromba NOGUI ${loadfromba_SRCS}) -TARGET_LINK_LIBRARIES(loadfromba kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(loadfromba kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -SET(erasetag_SRCS erasetag.cpp) +set(erasetag_SRCS erasetag.cpp) KDE4_ADD_EXECUTABLE(erasetag NOGUI ${erasetag_SRCS}) -TARGET_LINK_LIBRARIES(erasetag kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(erasetag kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -SET(printtagslist_SRCS printtagslist.cpp) +set(printtagslist_SRCS printtagslist.cpp) KDE4_ADD_EXECUTABLE(printtagslist NOGUI ${printtagslist_SRCS}) -TARGET_LINK_LIBRARIES(printtagslist kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(printtagslist kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -SET(usexmpsidecar_SRCS usexmpsidecar.cpp) +set(usexmpsidecar_SRCS usexmpsidecar.cpp) KDE4_ADD_EXECUTABLE(usexmpsidecar NOGUI ${usexmpsidecar_SRCS}) -TARGET_LINK_LIBRARIES(usexmpsidecar kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(usexmpsidecar kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -SET(readimagewritexmpsidecar_SRCS readimagewritexmpsidecar.cpp) +set(readimagewritexmpsidecar_SRCS readimagewritexmpsidecar.cpp) KDE4_ADD_EXECUTABLE(readimagewritexmpsidecar NOGUI ${readimagewritexmpsidecar_SRCS}) -TARGET_LINK_LIBRARIES(readimagewritexmpsidecar kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(readimagewritexmpsidecar kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) -SET(setxmpface_SRCS setxmpface.cpp) +set(setxmpface_SRCS setxmpface.cpp) KDE4_ADD_EXECUTABLE(setxmpface NOGUI ${setxmpface_SRCS}) -TARGET_LINK_LIBRARIES(setxmpface kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) +target_link_libraries(setxmpface kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
