rev 6592 - in kde-extras/digikam/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Tue Jun 26 18:15:54 UTC 2007
Author: ach-guest
Date: 2007-06-26 18:15:54 +0000 (Tue, 26 Jun 2007)
New Revision: 6592
Added:
kde-extras/digikam/trunk/debian/patches/10_kde_r680586_bug147248_sync_image_info_in_ie.diff
kde-extras/digikam/trunk/debian/patches/11_kde_r680604_bug147147_fix_apply_tags.diff
kde-extras/digikam/trunk/debian/patches/12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
Log:
* add selected fixes from upstream:
10_kde_r680586_bug147248_sync_image_info_in_ie.diff
11_kde_r680604_bug147147_fix_apply_tags.diff
12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2007-06-26 18:08:30 UTC (rev 6591)
+++ kde-extras/digikam/trunk/debian/changelog 2007-06-26 18:15:54 UTC (rev 6592)
@@ -1,10 +1,12 @@
digikam (2:0.9.2-2) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * NOT RELEASED YET (upload to experimental when done)
- * TODO:
- + use soon to be released released libkexiv2-2 (that break ABI too)
- Try to get let upstream use versioned symbols
+ [ Achim Bohnet ]
+ * add selected fixes from upstream:
+ 10_kde_r680586_bug147248_sync_image_info_in_ie.diff
+ 11_kde_r680604_bug147147_fix_apply_tags.diff
+ 12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Mon, 18 Jun 2007 11:22:58 +0100
Added: kde-extras/digikam/trunk/debian/patches/10_kde_r680586_bug147248_sync_image_info_in_ie.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/10_kde_r680586_bug147248_sync_image_info_in_ie.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/10_kde_r680586_bug147248_sync_image_info_in_ie.diff 2007-06-26 18:15:54 UTC (rev 6592)
@@ -0,0 +1,13 @@
+Index: digikam/utilities/imageeditor/editor/imagewindow.cpp
+===================================================================
+--- digikam/utilities/imageeditor/editor/imagewindow.cpp (revision 680585)
++++ digikam/utilities/imageeditor/editor/imagewindow.cpp (revision 680586)
+@@ -533,7 +533,7 @@
+ return;
+
+ d->urlCurrent = d->urlList.last();
+- d->imageInfoCurrent = d->imageInfoList.first();
++ d->imageInfoCurrent = d->imageInfoList.last();
+ slotLoadCurrent();
+ }
+
Added: kde-extras/digikam/trunk/debian/patches/11_kde_r680604_bug147147_fix_apply_tags.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/11_kde_r680604_bug147147_fix_apply_tags.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/11_kde_r680604_bug147147_fix_apply_tags.diff 2007-06-26 18:15:54 UTC (rev 6592)
@@ -0,0 +1,14 @@
+Index: digikam/digikam/iconview.cpp
+===================================================================
+--- digikam/digikam/iconview.cpp (revision 680603)
++++ digikam/digikam/iconview.cpp (revision 680604)
+@@ -1186,6 +1186,9 @@
+ p.end();
+
+ d->pressedMoved = true;
++
++ if (changed)
++ emit signalSelectionChanged();
+ }
+
+ void IconView::contentsMouseReleaseEvent(QMouseEvent* e)
Added: kde-extras/digikam/trunk/debian/patches/12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff 2007-06-26 18:15:54 UTC (rev 6592)
@@ -0,0 +1,111 @@
+Index: digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
+===================================================================
+--- digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp (revision 676578)
++++ digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp (revision 676579)
+@@ -29,10 +29,10 @@
+
+ #define MINRANGE 0
+
+-// Fibanocci irrationel Golden Number.
+-#define PHI 1.618033988
++// Golden number (1+sqrt(5))/2
++#define PHI 1.61803398874989479
+ // 1/PHI
+-#define INVPHI 0.61803398903633
++#define INVPHI 0.61803398874989479
+
+ // C++ includes.
+
+@@ -858,43 +858,53 @@
+ if (d->flipHorGoldenGuide)
+ p.scale(-1, 1);
+
+- // Flip verical.
++ // Flip vertical.
+ if (d->flipVerGoldenGuide)
+ p.scale(1, -1);
+
+ int w = d->localRegionSelection.width();
+ int h = d->localRegionSelection.height();
+
+- QRect R1(-w/2, -h/2,
+- (int)(w/PHI), h);
+- QRect R2((int)(w*(INVPHI - 0.5)), (int)(h*(0.5 - INVPHI)),
+- (int)(w*(1 - INVPHI)), (int)(h/PHI));
+- QRect R3((int)(w/2 - R2.width()/PHI), -h/2,
+- (int)(R2.width()/PHI), h - R2.height());
++ // lengths for the golden mean and half the sizes of the region:
++ int w_g = (int)(w*INVPHI);
++ int h_g = (int)(h*INVPHI);
++ int w_2 = w/2;
++ int h_2 = h/2;
++
++ QRect R1(-w_2, -h_2, w_g, h);
++ // w - 2*w_2 corrects for one-pixel difference
++ // so that R2.right() is really at the right end of the region
++ QRect R2(w_g-w_2, h_2-h_g, w-w_g+1-(w - 2*w_2), h_g);
++
++ QRect R3((int)(w_2 - R2.width()*INVPHI), -h_2,
++ (int)(R2.width()*INVPHI), h - R2.height());
+ QRect R4(R2.x(), R1.y(), R3.x() - R2.x(),
+- (int)(R3.height()/PHI));
+- QRect R5(R4.x(), R4.bottom(), (int)(R4.width()/PHI),
++ (int)(R3.height()*INVPHI));
++ QRect R5(R4.x(), R4.bottom(), (int)(R4.width()*INVPHI),
+ R3.height() - R4.height());
+- QRect R6(R5.x() + R5.width(), R5.bottom() - (int)(R5.height()/PHI),
+- R3.x() - R5.right(), (int)(R5.height()/PHI));
+- QRect R7(R6.right() - (int)(R6.width()/PHI), R4.bottom(),
+- (int)(R6.width()/PHI), R5.height() - R6.height());
++ QRect R6(R5.x() + R5.width(), R5.bottom() - (int)(R5.height()*INVPHI),
++ R3.x() - R5.right(), (int)(R5.height()*INVPHI));
++ QRect R7(R6.right() - (int)(R6.width()*INVPHI), R4.bottom(),
++ (int)(R6.width()*INVPHI), R5.height() - R6.height());
+
+ p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine));
+
+ // Drawing Golden sections.
+ if (d->drawGoldenSection)
+ {
++ // horizontal lines:
+ p.drawLine( R1.left(), R2.top(),
+ R2.right(), R2.top());
+
+ p.drawLine( R1.left(), R1.top() + R2.height(),
+ R2.right(), R1.top() + R2.height());
+
+- p.drawLine( R2.right() - R1.width(), R1.top(),
+- R2.right() - R1.width(), R1.bottom() );
++ // vertical lines:
++ p.drawLine( R1.right(), R1.top(),
++ R1.right(), R1.bottom() );
+
+- p.drawLine( R1.topRight(), R1.bottomRight() );
++ p.drawLine( R1.left()+R2.width(), R1.top(),
++ R1.left()+R2.width(), R1.bottom() );
+ }
+
+ // Drawing Golden triangle guides.
+@@ -966,16 +976,19 @@
+ // Drawing Golden sections.
+ if (d->drawGoldenSection)
+ {
++ // horizontal lines:
+ p.drawLine( R1.left(), R2.top(),
+ R2.right(), R2.top());
+
+ p.drawLine( R1.left(), R1.top() + R2.height(),
+ R2.right(), R1.top() + R2.height());
+
+- p.drawLine( R2.right() - R1.width(), R1.top(),
+- R2.right() - R1.width(), R1.bottom() );
++ // vertical lines:
++ p.drawLine( R1.right(), R1.top(),
++ R1.right(), R1.bottom() );
+
+- p.drawLine( R1.topRight(), R1.bottomRight() );
++ p.drawLine( R1.left()+R2.width(), R1.top(),
++ R1.left()+R2.width(), R1.bottom() );
+ }
+
+ // Drawing Golden triangle guides.
More information about the pkg-kde-commits
mailing list