Fix FTBFS on arm

1 message Options
Embed this post
Permalink
Toby Smithe-2

Fix FTBFS on arm

Reply Threaded More More options
Print post
Permalink
Debian bug #516892; patch appended below.

Package: mscore
Severity: important
Version: 0.9.4+dfsg-1
User: [hidden email]
Usertags: eabi

At the mscore build log:

[ 61%] Building CXX object mscore/CMakeFiles/mscore.dir/barline.o
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp: In member
function 'virtual void BarLine::draw(QPainter&) const':
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:97: error:
no matching function for call to 'BarLine::getY(qreal*, qreal*) const'
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:65: note:
candidates are: void BarLine::getY(double*, double*) const
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp: In member
function 'virtual QRectF BarLine::bbox() const':
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:274: error:
no matching function for call to 'BarLine::getY(qreal*, qreal*) const'
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:65: note:
candidates are: void BarLine::getY(double*, double*) const
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp: In member
function 'virtual void BarLine::updateGrips(int*, QRectF*) const':
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:366: error:
no matching function for call to 'BarLine::getY(qreal*, qreal*) const'
/build/buildd/mscore-0.9.4+dfsg/mscore/mscore/barline.cpp:65: note:
candidates are: void BarLine::getY(double*, double*) const

qreal is float on arm, while other archs use double. either change BarLine::*
functions to accept qreal's instread of doubles, or cast them to double's
before passing forward.

Index: mscore/mscore/barline.cpp
===================================================================
--- mscore/mscore/barline.cpp (revision 1660)
+++ mscore/mscore/barline.cpp (working copy)
@@ -96,7 +96,7 @@
       {
       qreal lw = score()->style(ST_barWidth).toSpatium().point() * mag();
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1,(double*)&y2);

       QPen pen(p.pen());
       pen.setWidthF(lw);
@@ -273,7 +273,7 @@
 QRectF BarLine::bbox() const
       {
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       Spatium w = score()->style(ST_barWidth).toSpatium() * mag();
       qreal dw  = 0.0;

@@ -365,7 +365,7 @@
       *grips   = 1;
       qreal lw = score()->style(ST_barWidth).toSpatium().point();
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
       }


--
Toby Smithe :: http://fulltinreality.com

------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer