← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scribus/trusty

« back to all changes in this revision

Viewing changes to scribus/plugins/imposition/imposition.cpp

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-05-16 20:34:07 UTC
  • mfrom: (1.1.13) (32.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130516203407-ztj7ebsivoo41dih
Tags: 1.4.2.dfsg+r18267-1ubuntu2
Avoid qreal/double type clashes on ARM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/plugins/imposition/imposition.cpp
542
542
                                        }
543
543
                                        groupcontrol->SetRectFrame();
544
544
                                        
545
 
                                        double points[32] = {
 
545
                                        qreal points[32] = {
546
546
                                        //left upper corner - left lower corner
547
547
                                        targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
548
548
                                        targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
730
730
                                        }
731
731
                                        groupcontrol->SetRectFrame();
732
732
                                        
733
 
                                        double points[32] = {
 
733
                                        qreal points[32] = {
734
734
                                        //left upper corner - left lower corner
735
735
                                        0,
736
736
                                        0,
893
893
                                        }
894
894
                                        groupcontrol->SetRectFrame();
895
895
                                        
896
 
                                        double points[32] = {
 
896
                                        qreal points[32] = {
897
897
                                        //left upper corner - left lower corner
898
898
                                        0,
899
899
                                        0,
1047
1047
                                        }
1048
1048
                                        groupcontrol->SetRectFrame();
1049
1049
                                        
1050
 
                                        double points[32] = {
 
1050
                                        qreal points[32] = {
1051
1051
                                        //left upper corner - left lower corner
1052
1052
                                        targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
1053
1053
                                        targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),