← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qgis/trusty

« back to all changes in this revision

Viewing changes to debian/patches/composer.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Johan Van de Wauw
  • Date: 2010-07-11 20:23:24 UTC
  • mfrom: (3.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100711202324-5ktghxa7hracohmr
Tags: 1.4.0+12730-3ubuntu1
https://launchpad.net/bugs/540941
* Merge from Debian unstable (LP: #540941).
* Fix compilation issues with QT 4.7
* Add build-depends on libqt4-webkit-dev 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/composer.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## composer.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad qgis~/src/composer/qgscomposition.cpp qgis/src/composer/qgscomposition.cpp
9
 
--- qgis~/src/composer/qgscomposition.cpp       2007-06-28 13:12:02.000000000 +0200
10
 
+++ qgis/src/composer/qgscomposition.cpp        2007-10-15 20:20:07.000000000 +0200
11
 
@@ -236,7 +236,7 @@
12
 
   mLastPoint = p;
13
 
 
14
 
   double x,y;
15
 
-  mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
16
 
+  mView->inverseWorldMatrix().map( (qreal) e->pos().x(), (qreal) e->pos().y(), (qreal *)&x, (qreal *)&y );
17
 
 
18
 
   switch ( mTool ) {
19
 
     case Select:
20
 
@@ -395,7 +395,7 @@
21
 
     case Select:
22
 
       if ( mSelectedItem ) {
23
 
         double x,y;
24
 
-        mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
25
 
+        mView->inverseWorldMatrix().map( (qreal) e->pos().x(), (qreal) e->pos().y(), (qreal *)&x, (qreal *)&y );
26
 
 
27
 
         mSelectedItem->moveBy ( x - mLastX, y - mLastY );
28