]>
Commit | Line | Data |
---|---|---|
8968a8cf AM |
1 | diff -urN digikam-0.9.3.orig/digikam/digikam/main.cpp digikam-0.9.3/digikam/digikam/main.cpp |
2 | --- digikam-0.9.3.orig/digikam/digikam/main.cpp 2007-12-22 19:19:47 +0200 | |
3 | +++ digikam-0.9.3/digikam/digikam/main.cpp 2008-03-16 23:09:28 +0200 | |
4 | @@ -49,6 +49,9 @@ | |
5 | // KIPI Includes. | |
6 | ||
7 | #include <libkipi/version.h> | |
8 | +#if KIPI_VERSION >= 0x000106 | |
9 | +#include <libkipi/interface.h> | |
10 | +#endif | |
11 | ||
12 | // Libkexiv2 includes. | |
13 | ||
14 | @@ -58,6 +61,9 @@ | |
15 | // Libkdcraw includes. | |
16 | ||
17 | #include <libkdcraw/version.h> | |
18 | +#if KDCRAW_VERSION >= 0x000104 | |
19 | +#include <libkdcraw/kdcraw.h> | |
20 | +#endif | |
21 | #include <libkdcraw/dcrawbinary.h> | |
22 | ||
23 | // C Ansi includes. | |
24 | @@ -91,13 +97,25 @@ | |
25 | ||
26 | QString Gphoto2Ver = QString(gp_library_version(GP_VERSION_SHORT)[0]); | |
27 | ||
28 | +#if KIPI_VERSION >= 0x000106 | |
29 | + QString libInfo = QString(I18N_NOOP("Using Kipi library version %1")).arg(KIPI::Interface::version()) + | |
30 | +#else | |
31 | QString libInfo = QString(I18N_NOOP("Using Kipi library version %1")).arg(kipi_version) + | |
32 | +#endif | |
33 | QString("\n") + | |
34 | +#if KEXIV2_VERSION >= 0x000107 | |
35 | + QString(I18N_NOOP("Using KExiv2 library version %1")).arg(KExiv2Iface::KExiv2::version()) + | |
36 | +#else | |
37 | QString(I18N_NOOP("Using KExiv2 library version %1")).arg(kexiv2_version) + | |
38 | +#endif | |
39 | QString("\n") + | |
40 | QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) + | |
41 | QString("\n") + | |
42 | +#if KDCRAW_VERSION >= 0x000104 | |
43 | + QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) + | |
44 | +#else | |
45 | QString(I18N_NOOP("Using KDcraw library version %1")).arg(kdcraw_version) + | |
46 | +#endif | |
47 | QString("\n") + | |
48 | QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) + | |
49 | QString("\n") + | |
50 | diff -urN digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp | |
51 | --- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp 2007-12-22 19:19:47 +0200 | |
52 | +++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp 2008-03-16 23:02:05 +0200 | |
53 | @@ -78,6 +78,7 @@ | |
54 | #include <kprogress.h> | |
55 | #include <kwin.h> | |
56 | #include <kcombobox.h> | |
57 | +#include <libkdcraw/version.h> | |
58 | ||
59 | // Local includes. | |
60 | ||
61 | @@ -885,8 +886,15 @@ | |
62 | m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB; | |
63 | ||
64 | m_IOFileSettings->rawDecodingSettings.sixteenBitsImage = config->readBoolEntry("SixteenBitsImage", false); | |
65 | +#if KDCRAW_VERSION >= 0x000104 | |
66 | + m_IOFileSettings->rawDecodingSettings.whiteBalance = (KDcrawIface::RawDecodingSettings::WhiteBalance)config->readNumEntry("WhiteBalance", | |
67 | + KDcrawIface::RawDecodingSettings::CAMERA); | |
68 | + m_IOFileSettings->rawDecodingSettings.customWhiteBalance = config->readNumEntry("CustomWhiteBalance", 6500); | |
69 | + m_IOFileSettings->rawDecodingSettings.customWhiteBalanceGreen = config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0); | |
70 | +#else | |
71 | m_IOFileSettings->rawDecodingSettings.automaticColorBalance = config->readBoolEntry("AutomaticColorBalance", true); | |
72 | m_IOFileSettings->rawDecodingSettings.cameraColorBalance = config->readBoolEntry("CameraColorBalance", true); | |
73 | +#endif | |
74 | m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors = config->readBoolEntry("RGBInterpolate4Colors", false); | |
75 | m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false); | |
76 | m_IOFileSettings->rawDecodingSettings.enableNoiseReduction = config->readBoolEntry("EnableNoiseReduction", false); | |
77 | diff -urN digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.cpp digikam-0.9.3/digikam/utilities/setup/setupdcraw.cpp | |
78 | --- digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.cpp 2007-12-22 19:19:47 +0200 | |
79 | +++ digikam-0.9.3/digikam/utilities/setup/setupdcraw.cpp 2008-03-16 23:09:28 +0200 | |
80 | @@ -44,6 +44,7 @@ | |
81 | ||
82 | // LibKDcraw includes. | |
83 | ||
84 | +#include <libkdcraw/version.h> | |
85 | #include <libkdcraw/dcrawsettingswidget.h> | |
86 | ||
87 | // Local includes. | |
88 | @@ -89,8 +90,14 @@ | |
89 | KConfig* config = kapp->config(); | |
90 | config->setGroup("ImageViewer Settings"); | |
91 | config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits()); | |
92 | +#if KDCRAW_VERSION >= 0x000104 | |
93 | + config->writeEntry("WhiteBalance", d->dcrawSettings->whiteBalance()); | |
94 | + config->writeEntry("CustomWhiteBalance", d->dcrawSettings->customWhiteBalance()); | |
95 | + config->writeEntry("CustomWhiteBalanceGreen", d->dcrawSettings->customWhiteBalanceGreen()); | |
96 | +#else | |
97 | config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB()); | |
98 | config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance()); | |
99 | +#endif | |
100 | config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor()); | |
101 | config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels()); | |
102 | config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction()); | |
103 | @@ -116,8 +123,16 @@ | |
104 | d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0)); | |
105 | d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false)); | |
106 | d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0)); | |
107 | +#if KDCRAW_VERSION >= 0x000104 | |
108 | + d->dcrawSettings->setWhiteBalance((KDcrawIface::RawDecodingSettings::WhiteBalance) | |
109 | + config->readNumEntry("WhiteBalance", | |
110 | + KDcrawIface::RawDecodingSettings::CAMERA)); | |
111 | + d->dcrawSettings->setCustomWhiteBalance(config->readNumEntry("CustomWhiteBalance", 6500)); | |
112 | + d->dcrawSettings->setCustomWhiteBalanceGreen(config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0)); | |
113 | +#else | |
114 | d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true)); | |
115 | d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true)); | |
116 | +#endif | |
117 | d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false)); | |
118 | d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality) | |
119 | config->readNumEntry("RAWQuality", |