diff options
Diffstat (limited to 'graphics/digikam-kde4/files')
6 files changed, 0 insertions, 116 deletions
diff --git a/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp b/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp deleted file mode 100644 index 04c1843669e2..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- digikam/digikam/scanlib.cpp.orig Tue Apr 11 13:48:55 2006 -+++ digikam/digikam/scanlib.cpp Tue Apr 11 13:50:28 2006 -@@ -260,7 +260,7 @@ - int items = 0; - - QDir dir( directory ); -- if ( !dir.exists() or !dir.isReadable() ) -+ if ( !dir.exists() || !dir.isReadable() ) - return 0; - - const QFileInfoList *list = dir.entryInfoList(); -@@ -287,7 +287,7 @@ - void ScanLib::allFiles(const QString& directory) - { - QDir dir( directory ); -- if ( !dir.exists() or !dir.isReadable() ) -+ if ( !dir.exists() || !dir.isReadable() ) - { - kdWarning() << "Folder does not exist or is not readable: " - << directory << endl; diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp deleted file mode 100644 index 6bbcd2f3bbfb..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- digikam/kioslave/digikamdates.cpp.orig Tue Apr 11 13:53:08 2006 -+++ digikam/kioslave/digikamdates.cpp Tue Apr 11 13:53:54 2006 -@@ -186,7 +186,7 @@ - .arg(moStr2) - .arg(yr,4) - .arg(moStr1,2), -- &values, false); -+ &values); - - Q_LLONG imageid; - QString name; diff --git a/graphics/digikam-kde4/files/patch-digikam_libs_lprof_lcmsprf.h b/graphics/digikam-kde4/files/patch-digikam_libs_lprof_lcmsprf.h deleted file mode 100644 index 4c890dae968b..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_libs_lprof_lcmsprf.h +++ /dev/null @@ -1,10 +0,0 @@ ---- digikam/libs/lprof/lcmsprf.h.orig 2007-09-18 08:30:45.000000000 +0200 -+++ digikam/libs/lprof/lcmsprf.h 2007-09-18 08:36:16.000000000 +0200 -@@ -59,6 +59,7 @@ - #define max(a,b) ((a) > (b)?(a):(b)) - #endif - -+typedef int BOOL; - - /* Matrix operations - arbitrary size ----------------------------------------------------- */ - diff --git a/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_gpcamera.cpp b/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_gpcamera.cpp deleted file mode 100644 index f941396355d3..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_gpcamera.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- digikam/utilities/cameragui/gpcamera.cpp.orig 2007-09-18 09:23:44.000000000 +0200 -+++ digikam/utilities/cameragui/gpcamera.cpp 2007-09-18 09:24:48.000000000 +0200 -@@ -22,13 +22,6 @@ - * - * ============================================================ */ - --// C Ansi includes. -- --extern "C" --{ --#include <gphoto2.h> --} -- - // C++ includes. - - #include <cstdio> -@@ -47,6 +40,13 @@ - - #include <klocale.h> - -+// C Ansi includes. -+ -+extern "C" -+{ -+#include <gphoto2.h> -+} -+ - // Local includes. - - #include "ddebug.h" diff --git a/graphics/digikam-kde4/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp b/graphics/digikam-kde4/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp deleted file mode 100644 index 2d528b387f9e..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_utilities_imageeditor_editor_editorwindow.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- digikam/utilities/imageeditor/editor/editorwindow.cpp.orig 2008-03-15 12:21:58.000000000 +0100 -+++ digikam/utilities/imageeditor/editor/editorwindow.cpp 2008-03-15 12:36:19.000000000 +0100 -@@ -885,8 +885,12 @@ - m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB; - - m_IOFileSettings->rawDecodingSettings.sixteenBitsImage = config->readBoolEntry("SixteenBitsImage", false); -- m_IOFileSettings->rawDecodingSettings.automaticColorBalance = config->readBoolEntry("AutomaticColorBalance", true); -- m_IOFileSettings->rawDecodingSettings.cameraColorBalance = config->readBoolEntry("CameraColorBalance", true); -+ if (config->readBoolEntry("CameraColorBalance", true)) -+ m_IOFileSettings->rawDecodingSettings.whiteBalance = KDcrawIface::RawDecodingSettings::CAMERA; -+ else if (config->readBoolEntry("AutomaticColorBalance", true)) -+ m_IOFileSettings->rawDecodingSettings.whiteBalance = KDcrawIface::RawDecodingSettings::AUTO; -+ else -+ m_IOFileSettings->rawDecodingSettings.whiteBalance = KDcrawIface::RawDecodingSettings::NONE; - m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors = config->readBoolEntry("RGBInterpolate4Colors", false); - m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false); - m_IOFileSettings->rawDecodingSettings.enableNoiseReduction = config->readBoolEntry("EnableNoiseReduction", false); diff --git a/graphics/digikam-kde4/files/patch-digikam_utilities_setup_setupdcraw.cpp b/graphics/digikam-kde4/files/patch-digikam_utilities_setup_setupdcraw.cpp deleted file mode 100644 index 73af8e12ac4e..000000000000 --- a/graphics/digikam-kde4/files/patch-digikam_utilities_setup_setupdcraw.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- digikam/utilities/setup/setupdcraw.cpp.orig 2008-03-15 13:24:50.000000000 +0100 -+++ digikam/utilities/setup/setupdcraw.cpp 2008-03-15 13:32:56.000000000 +0100 -@@ -89,8 +89,8 @@ - KConfig* config = kapp->config(); - config->setGroup("ImageViewer Settings"); - config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits()); -- config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB()); -- config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance()); -+ config->writeEntry("CameraColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::CAMERA); -+ config->writeEntry("AutomaticColorBalance", d->dcrawSettings->whiteBalance() == KDcrawIface::RawDecodingSettings::AUTO); - config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor()); - config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels()); - config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction()); -@@ -116,8 +116,12 @@ - d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0)); - d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false)); - d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0)); -- d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true)); -- d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true)); -+ if (config->readBoolEntry("CameraColorBalance", true)) -+ d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::CAMERA); -+ else if (config->readBoolEntry("AutomaticColorBalance", true)) -+ d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::AUTO); -+ else -+ d->dcrawSettings->setWhiteBalance(KDcrawIface::RawDecodingSettings::NONE); - d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false)); - d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality) - config->readNumEntry("RAWQuality", |