|
Git commit 4835b366f531b8bfaa784bd7ccad778fe547c79b by Gilles Caulier.
Committed on 27/01/2012 at 11:01. Pushed by cgilles into branch 'master'. remove deprecated methods and members. bump API/ABI version. Binary compatibility is broken. Applications needs to be recompiled. CCMAIL: [hidden email] CCMAIL: [hidden email] M +6 -7 CMakeLists.txt M +1 -1 icons/CMakeLists.txt M +1 -1 libkdcraw/CMakeLists.txt M +1 -1 libkdcraw/dcrawinfocontainer.cpp M +2 -5 libkdcraw/dcrawinfocontainer.h M +1 -1 libkdcraw/dcrawsettingswidget.cpp M +1 -1 libkdcraw/dcrawsettingswidget.h M +3 -11 libkdcraw/kdcraw.cpp M +2 -17 libkdcraw/kdcraw.h M +1 -1 libkdcraw/kdcraw_p.cpp M +1 -1 libkdcraw/kdcraw_p.h M +1 -1 libkdcraw/rawdecodingsettings.cpp M +1 -1 libkdcraw/rawdecodingsettings.h M +1 -1 libkdcraw/rawfiles.h M +1 -1 libkdcraw/rcombobox.cpp M +1 -1 libkdcraw/rcombobox.h M +1 -1 libkdcraw/rexpanderbox.cpp M +1 -1 libkdcraw/rexpanderbox.h M +3 -3 libkdcraw/rnuminput.cpp M +1 -1 libkdcraw/rnuminput.h M +1 -1 libkdcraw/squeezedcombobox.cpp M +1 -1 libkdcraw/squeezedcombobox.h M +1 -1 libkdcraw/version.h.cmake M +1 -1 profiles/CMakeLists.txt M +1 -1 test/raw2png.cpp http://commits.kde.org/libkdcraw/4835b366f531b8bfaa784bd7ccad778fe547c79b diff --git a/CMakeLists.txt b/CMakeLists.txt index bb7c59b..ecd4cd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # @date 2006-12-09 # @brief a tread-safe libraw C++ program 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> # # This program is free software; you can redistribute it @@ -62,11 +62,12 @@ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKDCRAW_AREA_CODE_GENERAL}) # 1.3.0 => 10.0.0 (Released with KDE 4.6.0) # 2.0.0 => 20.0.0 (Released with KDE 4.7.0) # 2.0.1 => 20.0.1 (Released with KDE 4.8.0 - Introducing new deprecated members due to use libraw 0.14.x) +# 2.1.0 => 21.0.0 (Released with KDE 4.8.1 - Remove deprecated members # Library API version SET(DCRAW_LIB_MAJOR_VERSION "2") -SET(DCRAW_LIB_MINOR_VERSION "0") -SET(DCRAW_LIB_PATCH_VERSION "1") +SET(DCRAW_LIB_MINOR_VERSION "1") +SET(DCRAW_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 @@ -79,9 +80,9 @@ SET(DCRAW_LIB_SUFFIX_VERSION "") # Library ABI version used by linker. # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -SET(DCRAW_LIB_SO_CUR_VERSION "20") +SET(DCRAW_LIB_SO_CUR_VERSION "21") SET(DCRAW_LIB_SO_REV_VERSION "0") -SET(DCRAW_LIB_SO_AGE_VERSION "1") +SET(DCRAW_LIB_SO_AGE_VERSION "0") # ================================================================================================== # Set env. variables accordinly. @@ -121,8 +122,6 @@ else (LCMS2_FOUND) set(LCMS2_LIBRARIES ${LCMS_LIBRARIES} ) endif (LCMS2_FOUND) - - FIND_PACKAGE(JPEG) macro_log_feature(JPEG_FOUND "libjpeg" "JPEG image format support" "http://www.ijg.org" TRUE "" "Required by libkdcraw") diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index ab9528b..75795cc 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -6,7 +6,7 @@ # @date 2006-12-09 # @brief a tread-safe libraw C++ program interface for KDE # -# @author Copyright (C) 2006-2010 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> # # This program is free software; you can redistribute it diff --git a/libkdcraw/CMakeLists.txt b/libkdcraw/CMakeLists.txt index 41f547a..0343f88 100644 --- a/libkdcraw/CMakeLists.txt +++ b/libkdcraw/CMakeLists.txt @@ -6,7 +6,7 @@ # @date 2006-12-09 # @brief a tread-safe libraw C++ program 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> # # This program is free software; you can redistribute it diff --git a/libkdcraw/dcrawinfocontainer.cpp b/libkdcraw/dcrawinfocontainer.cpp index ab3aea6..c1cc6b6 100644 --- a/libkdcraw/dcrawinfocontainer.cpp +++ b/libkdcraw/dcrawinfocontainer.cpp @@ -7,7 +7,7 @@ * @date 2007-05-02 * @brief RAW file identification information container * - * @author Copyright (C) 2007-2011 by Gilles Caulier + * @author Copyright (C) 2007-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 diff --git a/libkdcraw/dcrawinfocontainer.h b/libkdcraw/dcrawinfocontainer.h index dfe41eb..cb2263a 100644 --- a/libkdcraw/dcrawinfocontainer.h +++ b/libkdcraw/dcrawinfocontainer.h @@ -7,7 +7,7 @@ * @date 2007-05-02 * @brief RAW file identification information container * - * @author Copyright (C) 2007-2011 by Gilles Caulier + * @author Copyright (C) 2007-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 @@ -82,7 +82,7 @@ public: /** Black level from Raw histogram. */ unsigned int blackPoint; - + /** Channel black levels from Raw histogram. */ unsigned int blackPointCh[8]; @@ -95,9 +95,6 @@ public: /** Left margin of raw image. */ unsigned int leftMargin; - unsigned int KDE_DEPRECATED rightMargin; - unsigned int KDE_DEPRECATED bottomMargin; - /** The raw image orientation */ ImageOrientation orientation; diff --git a/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/dcrawsettingswidget.cpp index 48d46dd..8a69dd5 100644 --- a/libkdcraw/dcrawsettingswidget.cpp +++ b/libkdcraw/dcrawsettingswidget.cpp @@ -7,7 +7,7 @@ * @date 2006-09-13 * @brief LibRaw settings widgets * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/dcrawsettingswidget.h b/libkdcraw/dcrawsettingswidget.h index a3ebd4d..40da151 100644 --- a/libkdcraw/dcrawsettingswidget.h +++ b/libkdcraw/dcrawsettingswidget.h @@ -7,7 +7,7 @@ * @date 2006-09-13 * @brief LibRaw settings widgets * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/kdcraw.cpp b/libkdcraw/kdcraw.cpp index 6ba5045..2661adb 100644 --- a/libkdcraw/kdcraw.cpp +++ b/libkdcraw/kdcraw.cpp @@ -7,7 +7,7 @@ * @date 2006-12-09 * @brief a tread-safe libraw C++ program interface * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> @@ -253,15 +253,7 @@ bool KDcraw::rawFileIdentify(DcrawInfoContainer& identify, const QString& path) // ---------------------------------------------------------------------------------- -bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify) -{ - return extractRAWData(filePath, rawData, identify, false, 0); -} - -// ---------------------------------------------------------------------------------- - -bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify, - bool /*addMaskedBorders*/, unsigned int shotSelect) +bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify, unsigned int shotSelect) { QFileInfo fileInfo(filePath); QString rawFilesExt(rawFiles()); @@ -328,7 +320,7 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI return false; } d->setProgress(0.6); - + KDcrawPriv::fillIndentifyInfo(&raw, identify); if (m_cancel) diff --git a/libkdcraw/kdcraw.h b/libkdcraw/kdcraw.h index 90408d8..2e74a62 100644 --- a/libkdcraw/kdcraw.h +++ b/libkdcraw/kdcraw.h @@ -7,7 +7,7 @@ * @date 2006-12-09 * @brief a tread-safe libraw C++ program interface * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> @@ -136,22 +136,7 @@ public: - All info about Raw image into 'identify' container. - 'false' is returned if loadding failed, else 'true'. */ - bool extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify); - - /** Extract Raw image data undemosaiced and without post processing from 'filePath' picture file. - This is a cancelable method which require a class instance to run because RAW pictures loading - can take a while. - - This method return: - - - A byte array container 'rawData' with raw data. - - All info about Raw image into 'identify' container. - - 'false' is returned if loadding failed, else 'true'. - - NOTE: 'addMaskedBorders' argument is deprectaed and will be removed in the future. - */ - KDE_DEPRECATED bool extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify, - bool addMaskedBorders, unsigned int shotSelect); + bool extractRAWData(const QString& filePath, QByteArray& rawData, DcrawInfoContainer& identify, unsigned int shotSelect=0); /** Extract a small size of decode RAW data from 'filePath' picture file using 'rawDecodingSettings' settings. This is a cancelable method which require diff --git a/libkdcraw/kdcraw_p.cpp b/libkdcraw/kdcraw_p.cpp index 1afd565..7b9e562 100644 --- a/libkdcraw/kdcraw_p.cpp +++ b/libkdcraw/kdcraw_p.cpp @@ -7,7 +7,7 @@ * @date 2008-10-09 * @brief internal private container for KDcraw * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 diff --git a/libkdcraw/kdcraw_p.h b/libkdcraw/kdcraw_p.h index 52f6c23..184f015 100644 --- a/libkdcraw/kdcraw_p.h +++ b/libkdcraw/kdcraw_p.h @@ -7,7 +7,7 @@ * @date 2008-10-09 * @brief internal private container for KDcraw * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 diff --git a/libkdcraw/rawdecodingsettings.cpp b/libkdcraw/rawdecodingsettings.cpp index df7bede..cb017ae 100644 --- a/libkdcraw/rawdecodingsettings.cpp +++ b/libkdcraw/rawdecodingsettings.cpp @@ -7,7 +7,7 @@ * @date 2006-12-09 * @brief Raw decoding settings * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/rawdecodingsettings.h b/libkdcraw/rawdecodingsettings.h index 32256de..26d72c3 100644 --- a/libkdcraw/rawdecodingsettings.h +++ b/libkdcraw/rawdecodingsettings.h @@ -7,7 +7,7 @@ * @date 2006-12-09 * @brief Raw decoding settings * - * @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 * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/rawfiles.h b/libkdcraw/rawfiles.h index fb90f74..406cdef 100644 --- a/libkdcraw/rawfiles.h +++ b/libkdcraw/rawfiles.h @@ -7,7 +7,7 @@ * @date 2005-11-06 * @brief list of RAW file extensions supported by libraw * - * @author Copyright (C) 2005-2011 by Gilles Caulier + * @author Copyright (C) 2005-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 diff --git a/libkdcraw/rcombobox.cpp b/libkdcraw/rcombobox.cpp index 303c02e..0ecb310 100644 --- a/libkdcraw/rcombobox.cpp +++ b/libkdcraw/rcombobox.cpp @@ -8,7 +8,7 @@ * @brief a combo box widget re-implemented with a * reset button to switch to a default item * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 diff --git a/libkdcraw/rcombobox.h b/libkdcraw/rcombobox.h index 4314c7a..d2d3a75 100644 --- a/libkdcraw/rcombobox.h +++ b/libkdcraw/rcombobox.h @@ -8,7 +8,7 @@ * @brief a combo box widget re-implemented with a * reset button to switch to a default item * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 diff --git a/libkdcraw/rexpanderbox.cpp b/libkdcraw/rexpanderbox.cpp index 1f4f7ea..5e90b1f 100644 --- a/libkdcraw/rexpanderbox.cpp +++ b/libkdcraw/rexpanderbox.cpp @@ -7,7 +7,7 @@ * @date 2008-03-14 * @brief A widget to host settings as expander box * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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) 2008-2011 by Marcel Wiesweg * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/rexpanderbox.h b/libkdcraw/rexpanderbox.h index 2b08c53..e722a4d 100644 --- a/libkdcraw/rexpanderbox.h +++ b/libkdcraw/rexpanderbox.h @@ -7,7 +7,7 @@ * @date 2008-03-14 * @brief A widget to host settings as expander box * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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) 2008-2011 by Marcel Wiesweg * <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a> diff --git a/libkdcraw/rnuminput.cpp b/libkdcraw/rnuminput.cpp index 6b0d639..ded3d05 100644 --- a/libkdcraw/rnuminput.cpp +++ b/libkdcraw/rnuminput.cpp @@ -9,7 +9,7 @@ * re-implemented with a reset button to switch to * a default value * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 @@ -153,9 +153,9 @@ public: double defaultValue; - QToolButton *resetButton; + QToolButton* resetButton; - KDoubleNumInput *input; + KDoubleNumInput* input; }; RDoubleNumInput::RDoubleNumInput(QWidget* parent) diff --git a/libkdcraw/rnuminput.h b/libkdcraw/rnuminput.h index 99c6776..06fe008 100644 --- a/libkdcraw/rnuminput.h +++ b/libkdcraw/rnuminput.h @@ -9,7 +9,7 @@ * re-implemented with a reset button to switch to * a default value * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 diff --git a/libkdcraw/squeezedcombobox.cpp b/libkdcraw/squeezedcombobox.cpp index 1e53bf8..f887ece 100644 --- a/libkdcraw/squeezedcombobox.cpp +++ b/libkdcraw/squeezedcombobox.cpp @@ -8,7 +8,7 @@ * @brief a combo box with a width not depending of text * content size * - * @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) 2008 by Andi Clemens * <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a> diff --git a/libkdcraw/squeezedcombobox.h b/libkdcraw/squeezedcombobox.h index 7cbfd2b..394f802 100644 --- a/libkdcraw/squeezedcombobox.h +++ b/libkdcraw/squeezedcombobox.h @@ -8,7 +8,7 @@ * @brief a combo box with a width not depending of text * content size * - * @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) 2008 by Andi Clemens * <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a> diff --git a/libkdcraw/version.h.cmake b/libkdcraw/version.h.cmake index 9718aee..a56d23c 100644 --- a/libkdcraw/version.h.cmake +++ b/libkdcraw/version.h.cmake @@ -6,7 +6,7 @@ * @date 2007-02-12 * @brief libraw program interface for KDE * - * @author Copyright (C) 2007-2011 by Gilles Caulier + * @author Copyright (C) 2007-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 diff --git a/profiles/CMakeLists.txt b/profiles/CMakeLists.txt index 8e8e2a0..7767115 100644 --- a/profiles/CMakeLists.txt +++ b/profiles/CMakeLists.txt @@ -6,7 +6,7 @@ # @date 2006-12-09 # @brief a tread-safe libraw C++ program 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> # # This program is free software; you can redistribute it diff --git a/test/raw2png.cpp b/test/raw2png.cpp index 1109944..96707d6 100644 --- a/test/raw2png.cpp +++ b/test/raw2png.cpp @@ -6,7 +6,7 @@ * @date 2008-15-09 * @brief a command line tool to convert RAW file to PNG * - * @author Copyright (C) 2008-2011 by Gilles Caulier + * @author Copyright (C) 2008-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 _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
| Free forum by Nabble | Edit this page |
