rev 9777 - in kde-extras/digikam/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Sun Mar 16 15:49:43 UTC 2008
Author: ach-guest
Date: 2008-03-16 15:49:43 +0000 (Sun, 16 Mar 2008)
New Revision: 9777
Added:
kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff
Removed:
kde-extras/digikam/trunk/debian/patches/02_autotools_update.diff
kde-extras/digikam/trunk/debian/patches/03_libtool_update.diff
kde-extras/digikam/trunk/debian/patches/04_am_maintainer_mode.diff
kde-extras/digikam/trunk/debian/patches/05_pedantic-errors.diff
kde-extras/digikam/trunk/debian/patches/06_disable_no_undefined.diff
kde-extras/digikam/trunk/debian/patches/98_buildprep.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/patches/series
kde-extras/digikam/trunk/debian/showfoto.install
Log:
digikam:
* Merge my changes from kubuntu:
* Remove relibtoolization patches:
02_autotools_update.diff
03_libtool_update.diff
04_am_maintainer_mode.diff
05_pedantic-errors.diff
06_disable_no_undefined.diff
98_buildprep.diff
let linker flag --as-needed in debian/rules do the job
* Add patch fix FTBFS with new libkdcraw3 pkgs (0.1.4) required by
kipi-plugins 0.1.5: 20_fix_ftbfs_with_libkdcraw3.diff
Fixes: https://bugs.kde.org/show_bug.cgi?id=146393
Thx to the Mandriva Maintainer Angelo Naselli to point me to the patch.
* Bump build dependency of libkdcraw to >= 0.1.4 as libkdraw3 patch above
requires it.
* Fix: [Hardy] digikam duplicates downloaded images while overwriting
existing ones. Added: patches/10_lp201053_fix_download_rename_race.diff
This is a backport of KDE SVN commit 783150. (Closes LP: #201053).
See also http://bugs.kde.org/show_bug.cgi?id=158377 for more information.
* add missing final newline to showfoto.install
* Edited images saved with a new name wheree only read/writabblbe by it's
owner. Now the umask is used. Add patches/30_respect_umask.diff. Fixes
http://bugs.kde.org/show_bug.cgi?id=145252
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2008-03-16 14:41:04 UTC (rev 9776)
+++ kde-extras/digikam/trunk/debian/changelog 2008-03-16 15:49:43 UTC (rev 9777)
@@ -1,14 +1,37 @@
digikam (2:0.9.3-2) UNRELEASED; urgency=low
- * TODO: verifying?
+ [ Achim Bohnet]
- [ Achim Bohnet ]
- * Backport fix from Kubuntu:
- Fix: [Hardy] digikam duplicates downloaded images while overwriting
+ * Merge my changes from kubuntu:
+
+ * Remove relibtoolization patches:
+ 02_autotools_update.diff
+ 03_libtool_update.diff
+ 04_am_maintainer_mode.diff
+ 05_pedantic-errors.diff
+ 06_disable_no_undefined.diff
+ 98_buildprep.diff
+ let linker flag --as-needed in debian/rules do the job
+
+ * Add patch fix FTBFS with new libkdcraw3 pkgs (0.1.4) required by
+ kipi-plugins 0.1.5: 20_fix_ftbfs_with_libkdcraw3.diff
+ Fixes: https://bugs.kde.org/show_bug.cgi?id=146393
+ Thx to the Mandriva Maintainer Angelo Naselli to point me to the patch.
+
+ * Bump build dependency of libkdcraw to >= 0.1.4 as libkdraw3 patch above
+ requires it.
+
+ * Fix: [Hardy] digikam duplicates downloaded images while overwriting
existing ones. Added: patches/10_lp201053_fix_download_rename_race.diff
- This is a backport of KDE SVN commit 783150. (Closes LP 201053).
+ This is a backport of KDE SVN commit 783150. (Closes LP: #201053).
See also http://bugs.kde.org/show_bug.cgi?id=158377 for more information.
+ * add missing final newline to showfoto.install
+
+ * Edited images saved with a new name wheree only read/writabblbe by it's
+ owner. Now the umask is used. Add patches/30_respect_umask.diff. Fixes
+ http://bugs.kde.org/show_bug.cgi?id=145252
+
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 12 Mar 2008 00:51:03 +0100
digikam (2:0.9.3-1) unstable; urgency=low
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2008-03-16 14:41:04 UTC (rev 9776)
+++ kde-extras/digikam/trunk/debian/control 2008-03-16 15:49:43 UTC (rev 9777)
@@ -7,7 +7,7 @@
libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkipi0-dev,
libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.5),
libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.14),
- libkdcraw-dev (>= 0.1.1)
+ libkdcraw-dev (>= 0.1.4)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log
Deleted: kde-extras/digikam/trunk/debian/patches/02_autotools_update.diff
Deleted: kde-extras/digikam/trunk/debian/patches/03_libtool_update.diff
Deleted: kde-extras/digikam/trunk/debian/patches/04_am_maintainer_mode.diff
Deleted: kde-extras/digikam/trunk/debian/patches/05_pedantic-errors.diff
Deleted: kde-extras/digikam/trunk/debian/patches/06_disable_no_undefined.diff
Added: kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff 2008-03-16 15:49:43 UTC (rev 9777)
@@ -0,0 +1,401 @@
+Index: imageplugins/whitebalance/imageeffect_whitebalance.cpp
+===================================================================
+--- digikam-0.9.3.orig/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp (révision 776168)
++++ digikam-0.9.3/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp (copie de travail)
+@@ -7,7 +7,8 @@
+ * Description : a digiKam image editor plugin to correct
+ * image white balance
+ *
+- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2008 by Guillaume Castagnino <casta at xwing dot info>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -191,7 +192,7 @@
+ m_adjTemperatureLabel = new QLabel(i18n("Adjustment:"), gboxSettings);
+ m_temperatureInput = new KDoubleNumInput(gboxSettings);
+ m_temperatureInput->setPrecision(1);
+- m_temperatureInput->setRange(2200.0, 7000.0, 10.0, true);
++ m_temperatureInput->setRange(2000.0, 12000.0, 10.0, true);
+ QWhatsThis::add( m_temperatureInput, i18n("<p>Set here the white balance color temperature in Kelvin."));
+
+ m_temperaturePresetLabel = new QLabel(i18n("Preset:"), gboxSettings);
+@@ -268,7 +269,7 @@
+ m_greenLabel = new QLabel(i18n("Green:"), gboxSettings);
+ m_greenInput = new KDoubleNumInput(gboxSettings);
+ m_greenInput->setPrecision(2);
+- m_greenInput->setRange(1.0, 2.5, 0.01, true);
++ m_greenInput->setRange(0.2, 2.5, 0.01, true);
+ QWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color "
+ "cast removal level."));
+
+@@ -633,7 +634,7 @@
+
+ m_destinationPreviewData = new uchar[w*h*(sb ? 8 : 4)];
+
+- double temperature = m_temperatureInput->value()/1000.0;
++ double temperature = m_temperatureInput->value();
+ double dark = m_darkInput->value();
+ double black = m_blackInput->value();
+ double mainExposure = m_mainExposureInput->value();
+@@ -666,7 +667,7 @@
+ int h = iface->originalHeight();
+ bool sb = iface->originalSixteenBit();
+
+- double temperature = m_temperatureInput->value()/1000.0;
++ double temperature = m_temperatureInput->value();
+ double dark = m_darkInput->value();
+ double black = m_blackInput->value();
+ double mainExposure = m_mainExposureInput->value();
+@@ -698,16 +699,16 @@
+ m_greenInput->blockSignals(true);
+ m_temperaturePresetCB->blockSignals(true);
+
+- // Neutral color temperature settings.
++ // Neutral color temperature settings is D65
+ m_darkInput->setValue(0.5);
+ m_blackInput->setValue(0.0);
+ m_mainExposureInput->setValue(0.0);
+ m_fineExposureInput->setValue(0.0);
+ m_gammaInput->setValue(1.0);
+ m_saturationInput->setValue(1.0);
+- m_greenInput->setValue(1.2);
+- m_temperaturePresetCB->setCurrentItem(Neutral);
+- slotTemperaturePresetChanged(Neutral);
++ m_greenInput->setValue(1.0);
++ m_temperaturePresetCB->setCurrentItem(DaylightD65);
++ slotTemperaturePresetChanged(DaylightD65);
+
+ m_previewWidget->resetSpotPosition();
+ m_channelCB->setCurrentItem(LuminosityChannel);
+@@ -739,8 +740,8 @@
+ m_fineExposureInput->setValue(config->readDoubleNumEntry("FineExposure", 0.0));
+ m_gammaInput->setValue(config->readDoubleNumEntry("Gamma", 1.0));
+ m_saturationInput->setValue(config->readDoubleNumEntry("Saturation", 1.0));
+- m_greenInput->setValue(config->readDoubleNumEntry("Green", 1.2));
+- m_temperatureInput->setValue(config->readDoubleNumEntry("Temperature", 4750.0));
++ m_greenInput->setValue(config->readDoubleNumEntry("Green", 1.0));
++ m_temperatureInput->setValue(config->readDoubleNumEntry("Temperature", 6500.0));
+ slotTemperatureChanged(m_temperatureInput->value());
+ slotChannelChanged(m_channelCB->currentItem());
+ slotScaleChanged(m_scaleBG->selectedId());
+Index: imageplugins/whitebalance/imageeffect_whitebalance.h
+===================================================================
+--- digikam-0.9.3.orig/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h (révision 776168)
++++ digikam-0.9.3/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h (copie de travail)
+@@ -7,7 +7,8 @@
+ * Description : a digiKam image editor plugin to correct
+ * image white balance
+ *
+- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2008 by Guillaume Castagnino <casta at xwing dot info>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -22,7 +23,6 @@
+ *
+ * ============================================================ */
+
+-
+ #ifndef IMAGEEFFECT_WHITEBALANCE_H
+ #define IMAGEEFFECT_WHITEBALANCE_H
+
+Index: libs/whitebalance/whitebalance.cpp
+===================================================================
+--- digikam-0.9.3.orig/digikam/libs/whitebalance/whitebalance.cpp (révision 776168)
++++ digikam-0.9.3/digikam/libs/whitebalance/whitebalance.cpp (copie de travail)
+@@ -6,7 +6,8 @@
+ * Date : 2007-16-01
+ * Description : white balance color correction.
+ *
+- * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2007-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2008 by Guillaume Castagnino <casta at xwing dot info>
+ *
+ * Some parts are inspired from RawPhoto implementation copyrighted
+ * 2004-2005 by Pawel T. Jochym <jochym at ifj edu pl>
+@@ -39,7 +40,6 @@
+
+ #include "ddebug.h"
+ #include "imagehistogram.h"
+-#include "blackbody.h"
+ #include "whitebalance.h"
+
+ namespace Digikam
+@@ -69,8 +69,8 @@
+ exposition = 0.0;
+ gamma = 1.0;
+ saturation = 1.0;
+- green = 1.2;
+- temperature = 4.750;
++ green = 1.0;
++ temperature = 6500.0;
+ }
+
+ bool clipSat;
+@@ -127,7 +127,7 @@
+ if (d->clipSat) d->mg = 1.0;
+ setLUTv();
+ setRGBmult();
+-
++
+ // Apply White balance adjustments.
+ adjustWhiteBalance(data, width, height, sixteenBit);
+ }
+@@ -136,41 +136,33 @@
+ {
+ // Calculate Temperature and Green component from color picked.
+
+- register int l, r, m;
+- double sR, sG, sB, mRB, t;
++ double tmin, tmax, mBR;
++ float mr, mg, mb;
+
+- t = QMAX( QMAX(tc.red(), tc.green()), tc.blue());
+- sR = tc.red() / t;
+- sG = tc.green() / t;
+- sB = tc.blue() / t;
+- mRB = sR / sB;
++ DDebug() << "Sums: R:" << tc.red() << " G:" << tc.green() << " B:" << tc.blue() << endl;
+
+- DDebug() << "Sums: R:" << sR << " G:" << sG << " B:" << sB << endl;
+-
+- l = 0;
+- r = sizeof(blackBodyWhiteBalance)/(sizeof(float)*3);
+- m = (r + l) / 2;
+-
+- for (l = 0, r = sizeof(blackBodyWhiteBalance)/(sizeof(float)*3), m = (l+r)/2 ; r-l > 1 ; m = (l+r)/2)
++ /* This is a dichotomic search based on Blue and Red layers ratio
++ to find the matching temperature
++ Adapted from ufraw (0.12.1) RGB_to_Temperature
++ */
++ tmin = 2000.0;
++ tmax = 12000.0;
++ mBR = (double)tc.blue() / (double)tc.red();
++ green = 1.0;
++ for (temperature = (tmin+tmax)/2; tmax-tmin > 10; temperature = (tmin+tmax)/2)
+ {
+- if (blackBodyWhiteBalance[m][0]/blackBodyWhiteBalance[m][2] > mRB)
+- l = m;
++ DDebug() << "Intermediate Temperature (K):" << temperature << endl;
++ setRGBmult(temperature, green, mr, mg, mb);
++ if (mr/mb > mBR)
++ tmax = temperature;
+ else
+- r = m;
+-
+- DDebug() << "L,M,R: " << l << " " << m << " " << r
+- << " blackBodyWhiteBalance[m]=:" << blackBodyWhiteBalance[m][0]/blackBodyWhiteBalance[m][2]
+- << endl;
++ tmin = temperature;
+ }
+-
+- DDebug() << "Temperature (K):" << m*10.0+2000.0 << endl;
++ // Calculate the green level to neutralize picture
++ green = (mr / mg) / ((double)tc.green() / (double)tc.red());
+
+- t = (blackBodyWhiteBalance[m][1]/blackBodyWhiteBalance[m][0]) / (sG/sR);
+-
+- DDebug() << "Green component:" << t << endl;
+-
+- temperature = m*10.0+2000.0;
+- green = t;
++ DDebug() << "Temperature (K):" << temperature << endl;
++ DDebug() << "Green component:" << green << endl;
+ }
+
+ void WhiteBalance::autoExposureAdjustement(uchar* data, int width, int height, bool sb,
+@@ -207,27 +199,75 @@
+ delete histogram;
+ }
+
+-void WhiteBalance::setRGBmult()
++void WhiteBalance::setRGBmult(double &temperature, double &green, float &mr, float &mg, float &mb)
+ {
+- int t;
+ float mi;
++ double xD, yD, X, Y, Z;
+
+- if ( d->temperature > 7.0 ) d->temperature = 7.0;
++ if ( temperature > 12000 ) temperature = 12000.0;
+
+- t = (int)(d->temperature * 100.0 - 200.0);
+- d->mr = 1.0 / blackBodyWhiteBalance[t][0];
+- d->mg = 1.0 / blackBodyWhiteBalance[t][1];
+- d->mb = 1.0 / blackBodyWhiteBalance[t][2];
+- d->mg *= d->green;
++ /* Here starts the code picked from ufraw (0.12.1)
++ to convert Temperature + green multiplier to RGB multipliers
++ */
++ /* Convert between Temperature and RGB.
++ * Base on information from http://www.brucelindbloom.com/
++ * The fit for D-illuminant between 4000K and 12000K are from CIE
++ * The generalization to 2000K < T < 4000K and the blackbody fits
++ * are my own and should be taken with a grain of salt.
++ */
++ const double XYZ_to_RGB[3][3] = {
++ { 3.24071, -0.969258, 0.0556352 },
++ {-1.53726, 1.87599, -0.203996 },
++ {-0.498571, 0.0415557, 1.05707 } };
++ // Fit for CIE Daylight illuminant
++ if (temperature <= 4000)
++ {
++ xD = 0.27475e9/(temperature*temperature*temperature)
++ - 0.98598e6/(temperature*temperature)
++ + 1.17444e3/temperature + 0.145986;
++ }
++ else if (temperature <= 7000)
++ {
++ xD = -4.6070e9/(temperature*temperature*temperature)
++ + 2.9678e6/(temperature*temperature)
++ + 0.09911e3/temperature + 0.244063;
++ }
++ else
++ {
++ xD = -2.0064e9/(temperature*temperature*temperature)
++ + 1.9018e6/(temperature*temperature)
++ + 0.24748e3/temperature + 0.237040;
++ }
++ yD = -3*xD*xD + 2.87*xD - 0.275;
++
++ X = xD/yD;
++ Y = 1;
++ Z = (1-xD-yD)/yD;
++ mr = X*XYZ_to_RGB[0][0] + Y*XYZ_to_RGB[1][0] + Z*XYZ_to_RGB[2][0];
++ mg = X*XYZ_to_RGB[0][1] + Y*XYZ_to_RGB[1][1] + Z*XYZ_to_RGB[2][1];
++ mb = X*XYZ_to_RGB[0][2] + Y*XYZ_to_RGB[1][2] + Z*XYZ_to_RGB[2][2];
++ /* End of the code picked to ufraw
++ */
++
++ // Apply green multiplier
++ mg = mg / green;
++
++ mr = 1.0 / mr;
++ mg = 1.0 / mg;
++ mb = 1.0 / mb;
+
+ // Normalize to at least 1.0, so we are not dimming colors only bumping.
+- mi = QMIN(d->mr, d->mg);
+- mi = QMIN(mi, d->mb);
+- d->mr /= mi;
+- d->mg /= mi;
+- d->mb /= mi;
++ mi = QMIN(mr, QMIN(mg, mb));
++ mr /= mi;
++ mg /= mi;
++ mb /= mi;
+ }
+
++void WhiteBalance::setRGBmult()
++{
++ setRGBmult(d->temperature, d->green, d->mr, d->mg, d->mb);
++}
++
+ void WhiteBalance::setLUTv()
+ {
+ double b = d->mg * pow(2, d->exposition);
+Index: libs/whitebalance/whitebalance.h
+===================================================================
+--- digikam-0.9.3.orig/digikam/libs/whitebalance/whitebalance.h (révision 776168)
++++ digikam-0.9.3/digikam/libs/whitebalance/whitebalance.h (copie de travail)
+@@ -6,7 +6,8 @@
+ * Date : 2007-16-01
+ * Description : white balance color correction.
+ *
+- * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2007-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2008 by Guillaume Castagnino <casta at xwing dot info>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -45,7 +46,7 @@
+
+ void whiteBalance(uchar *data, int width, int height, bool sixteenBit,
+ double black=0.0, double exposition=0.0,
+- double temperature=4.750, double green=1.2, double dark=0.5,
++ double temperature=6500.0, double green=1.0, double dark=0.5,
+ double gamma=1.0, double saturation=1.0);
+
+ static void autoExposureAdjustement(uchar* data, int width, int height, bool sb,
+@@ -56,6 +57,7 @@
+ private:
+
+ void setRGBmult();
++ static void setRGBmult(double &temperature, double &green, float &mr, float &mg, float &mb);
+ void setLUTv();
+ void adjustWhiteBalance(uchar *data, int width, int height, bool sixteenBit);
+ inline unsigned short pixelColor(int colorMult, int index, int value);
+Index: utilities/setup/setupdcraw.cpp
+===================================================================
+--- digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.cpp (révision 776168)
++++ digikam-0.9.3/digikam/utilities/setup/setupdcraw.cpp (copie de travail)
+@@ -6,7 +6,7 @@
+ * Date : 2007-02-06
+ * Description : setup RAW decoding settings.
+ *
+- * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2007-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -89,8 +89,9 @@
+ 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("WhiteBalance", d->dcrawSettings->whiteBalance());
++ config->writeEntry("CustomWhiteBalance", d->dcrawSettings->customWhiteBalance());
++ config->writeEntry("CustomWhiteBalanceGreen", d->dcrawSettings->customWhiteBalanceGreen());
+ config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor());
+ config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels());
+ config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction());
+@@ -116,8 +117,11 @@
+ 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));
++ d->dcrawSettings->setWhiteBalance((KDcrawIface::RawDecodingSettings::WhiteBalance)
++ config->readNumEntry("WhiteBalance",
++ KDcrawIface::RawDecodingSettings::CAMERA));
++ d->dcrawSettings->setCustomWhiteBalance(config->readNumEntry("CustomWhiteBalance", 6500));
++ d->dcrawSettings->setCustomWhiteBalanceGreen(config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0));
+ d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
+ d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality)
+ config->readNumEntry("RAWQuality",
+Index: utilities/setup/setupdcraw.h
+===================================================================
+--- digikam-0.9.3.orig/digikam/utilities/setup/setupdcraw.h (révision 776168)
++++ digikam-0.9.3/digikam/utilities/setup/setupdcraw.h (copie de travail)
+@@ -6,7 +6,7 @@
+ * Date : 2007-02-06
+ * Description : setup RAW decoding settings.
+ *
+- * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2007-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: utilities/imageeditor/editor/editorwindow.cpp
+===================================================================
+--- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp (révision 776168)
++++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp (copie de travail)
+@@ -885,10 +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);
++ m_IOFileSettings->rawDecodingSettings.whiteBalance = (KDcrawIface::RawDecodingSettings::WhiteBalance)config->readNumEntry("WhiteBalance",
++ KDcrawIface::RawDecodingSettings::CAMERA);
++ m_IOFileSettings->rawDecodingSettings.customWhiteBalance = config->readNumEntry("CustomWhiteBalance", 6500);
++ m_IOFileSettings->rawDecodingSettings.customWhiteBalanceGreen = config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0);
+ m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors = config->readBoolEntry("RGBInterpolate4Colors", false);
+- m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false);
++ m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false);
+ m_IOFileSettings->rawDecodingSettings.enableNoiseReduction = config->readBoolEntry("EnableNoiseReduction", false);
+ m_IOFileSettings->rawDecodingSettings.unclipColors = config->readNumEntry("UnclipColors", 0);
+ m_IOFileSettings->rawDecodingSettings.RAWQuality = (KDcrawIface::RawDecodingSettings::DecodingQuality)config->readNumEntry("RAWQuality",
Added: kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/30_respect_umask.diff 2008-03-16 15:49:43 UTC (rev 9777)
@@ -0,0 +1,38 @@
+Index: utilities/imageeditor/editor/editorwindow.cpp
+===================================================================
+--- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp (revision 726776)
++++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp (working copy)
+@@ -1653,8 +1653,16 @@
+ {
+ QCString dstFileName = QFile::encodeName(m_savingContext->destinationURL.path());
+
+- // store old permissions
+- mode_t filePermissions = S_IREAD | S_IWRITE;
++ // Store old permissions:
++ // Just get the current umask.
++ mode_t curr_umask = umask(S_IREAD | S_IWRITE);
++ // Restore the umask.
++ umask(curr_umask);
++
++ // For new files respect the umask setting.
++ mode_t filePermissions = (S_IREAD | S_IWRITE | S_IROTH | S_IWOTH | S_IRGRP | S_IWGRP) & ~curr_umask;
++
++ // For existing files, use the mode of the original file.
+ if (m_savingContext->destinationExisted)
+ {
+ struct stat stbuf;
+@@ -1673,12 +1681,9 @@
+ }
+
+ // restore permissions
+- if (m_savingContext->destinationExisted)
++ if (::chmod(dstFileName, filePermissions) != 0)
+ {
+- if (::chmod(dstFileName, filePermissions) != 0)
+- {
+- DWarning() << "Failed to restore file permissions for file " << dstFileName << endl;
+- }
++ DWarning() << "Failed to restore file permissions for file " << dstFileName << endl;
+ }
+
+ return true;
Deleted: kde-extras/digikam/trunk/debian/patches/98_buildprep.diff
Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series 2008-03-16 14:41:04 UTC (rev 9776)
+++ kde-extras/digikam/trunk/debian/patches/series 2008-03-16 15:49:43 UTC (rev 9777)
@@ -1,7 +1,3 @@
-02_autotools_update.diff
-03_libtool_update.diff
-04_am_maintainer_mode.diff
-05_pedantic-errors.diff
-06_disable_no_undefined.diff
10_lp201053_fix_download_rename_race.diff
-98_buildprep.diff
+20_fix_ftbfs_with_libkdcraw3.diff
+30_respect_umask.diff
Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install 2008-03-16 14:41:04 UTC (rev 9776)
+++ kde-extras/digikam/trunk/debian/showfoto.install 2008-03-16 15:49:43 UTC (rev 9777)
@@ -1,4 +1,4 @@
usr/bin/showfoto
usr/share/apps/showfoto
usr/share/applications/kde/showfoto.desktop
-usr/share/icons/hicolor/*/apps/showfoto.png
\ No newline at end of file
+usr/share/icons/hicolor/*/apps/showfoto.png
More information about the pkg-kde-commits
mailing list