Commit ce14b9b6 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

remove deprecated methods. bump API/ABI version ID.

Client applications of this library as digiKam or kipi-plugins need to be recompiled.
CCMAIL: digikam-devel@kde.org
CCMAIL: kde-imaging@kde.org
parent e7684cce
......@@ -67,15 +67,16 @@ MACRO_LOG_FEATURE(EXIV2_FOUND "Exiv2" "Required to build libkexiv2." "http://www
# 0.6.0 => 7.3.0 (Released with KDE 4.3.0)
# 1.0.0 => 8.0.0 (Released with KDE 4.4.0)
# 1.1.0 => 8.1.0 (Released with KDE 4.5.0)
# 1.2.0 => 9.0.0 (Released with KDE 4.6.0 - Including XMP sidecar support)
# 1.2.0 => 9.0.0 (Released with KDE 4.6.0 - Including XMP sidecar support
# 2.0.0 => 10.0.0 (Released with KDE 4.7.0)
# 2.1.0 => 10.0.1 (Released with KDE 4.7.1) - Add AltLangStrEdit visible lines API
# 2.1.1 => 10.0.2 (Released with KDE 4.7.4) - Add AltLangStrEdit::setCurrentLanguageCode()
# 2.2.0 => 11.0.0 (Released with KDE 4.8.1) - Remove deprecated methods
# Library API version
SET(KEXIV2_LIB_MAJOR_VERSION "2")
SET(KEXIV2_LIB_MINOR_VERSION "1")
SET(KEXIV2_LIB_PATCH_VERSION "1")
SET(KEXIV2_LIB_MINOR_VERSION "2")
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,9 +89,9 @@ 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 "10")
SET(KEXIV2_LIB_SO_CUR_VERSION "11")
SET(KEXIV2_LIB_SO_REV_VERSION "0")
SET(KEXIV2_LIB_SO_AGE_VERSION "2")
SET(KEXIV2_LIB_SO_AGE_VERSION "0")
# =======================================================
# Set env. variables accordinly.
......
......@@ -7,7 +7,7 @@
* @date 2009-07-07
* @brief country selector combo-box.
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-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
......
......@@ -7,7 +7,7 @@
* @date 2009-07-07
* @brief country selector combo-box.
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-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
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Exiv2 library interface for KDE
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......@@ -241,11 +241,6 @@ void KExiv2::setData(const KExiv2Data& data)
}
}
bool KExiv2::load(const QByteArray& imgData) const
{
return loadFromData(imgData);
}
bool KExiv2::loadFromData(const QByteArray& imgData) const
{
if (imgData.isEmpty())
......
......@@ -13,9 +13,9 @@
* @brief http://www.iptc.org/std/Iptc4xmpCore/1.0/specification/Iptc4xmpCore_1.0-spec-XMPSchema_8.pdf
* @brief Paper: http://www.metadataworkinggroup.com/pdf/mwg_guidance.pdf
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......@@ -200,7 +200,6 @@ public:
Return true if metadata have been loaded successfully from image data.
*/
bool loadFromData(const QByteArray& imgData) const;
KDE_DEPRECATED 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.
......@@ -429,7 +428,6 @@ public:
Set true 'addExifHeader' parameter to add an Exif header to Exif metadata.
Returns a null Qt byte array if there is no Exif metadata in memory.
*/
KDE_DEPRECATED QByteArray getExif(bool addExifHeader=false) const;
QByteArray getExifEncoded(bool addExifHeader=false) const;
/** Set the Exif data using a Qt byte array. Return true if Exif metadata
......@@ -481,7 +479,7 @@ public:
/** Get an Exif tag content like a long value. Return true if Exif tag be found.
*/
bool getExifTagLong(const char* exifTagName, long &val) const;
/** Get an Exif tag content like a long value. Return true if Exif tag be found.
*/
bool getExifTagLong(const char* exifTagName, long &val, int component) const;
......
......@@ -7,9 +7,9 @@
* @date 2007-09-03
* @brief Exiv2 library interface for KDE
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2007-09-03
* @brief Exiv2 library interface for KDE
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Comments manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2009-11-15
* @brief Exiv2 library interface for KDE
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-2012 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2009-2011 by Marcel Wiesweg
* @author Copyright (C) 2009-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Exif manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......@@ -75,11 +75,6 @@ bool KExiv2::clearExif() const
return false;
}
QByteArray KExiv2::getExif(bool addExifHeader) const
{
return getExifEncoded(addExifHeader);
}
QByteArray KExiv2::getExifEncoded(bool addExifHeader) const
{
try
......
......@@ -7,11 +7,11 @@
* @date 2006-09-15
* @brief GPS manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
* @author Copyright (C) 2010-2011 by Michael G. Hansen
* @author Copyright (C) 2010-2012 by Michael G. Hansen
* <a href="mailto:mike at mghansen dot de">mike at mghansen dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Common metadata image information manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Iptc manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2009-11-14
* @brief Embedded preview loading
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-2012 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2009-2011 by Marcel Wiesweg
* @author Copyright (C) 2009-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2009-11-14
* @brief Embedded preview loading
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-2012 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2009-2011 by Marcel Wiesweg
* @author Copyright (C) 2009-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2006-09-15
* @brief Xmp manipulation methods
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2006-2011 by Marcel Wiesweg
* @author Copyright (C) 2006-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
*
* This program is free software; you can redistribute it
......
......@@ -7,7 +7,7 @@
* @date 2009-07-15
* @brief a text edit widget with click message.
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-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
......
......@@ -7,7 +7,7 @@
* @date 2009-07-15
* @brief a text edit widget with click message.
*
* @author Copyright (C) 2009-2011 by Gilles Caulier
* @author Copyright (C) 2009-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
......
......@@ -7,9 +7,9 @@
* @date 2009-08-03
* @brief Tools for combining rotation operations
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2004-2011 by Marcel Wiesweg
* @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>
*
* This program is free software; you can redistribute it
......
......@@ -7,9 +7,9 @@
* @date 2009-08-03
* @brief Tools for combining rotation operations
*
* @author Copyright (C) 2006-2011 by Gilles Caulier
* @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>
* @author Copyright (C) 2004-2011 by Marcel Wiesweg
* @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>
*
* This program is free software; you can redistribute it
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment