[SCM] iannix/master: Patch to allow non-double types for qreal
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon Jun 5 20:59:51 UTC 2017
The following commit has been merged in the master branch:
commit dae5f89bdb552ac4db29c7c85689997b54d105e3
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date: Mon Jun 5 22:27:27 2017 +0200
Patch to allow non-double types for qreal
Closes: #863109
diff --git a/debian/patches/qreal-not-double.patch b/debian/patches/qreal-not-double.patch
new file mode 100644
index 0000000..94f4266
--- /dev/null
+++ b/debian/patches/qreal-not-double.patch
@@ -0,0 +1,115 @@
+Description: allow (qreal) to not be (double)
+ On arm-archs, qreal has traditionally been (float).
+ This patch allows compilation on such systems.
+Author: IOhannes m zmölnig
+Forwarded: https://github.com/buzzinglight/IanniX/pull/27
+Applied-Upstream: ff85e8b9054ce676924d045dd974333b2fbd52d0
+Last-Update: 2017-06-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- iannix.orig/abstractionsgl.cpp
++++ iannix/abstractionsgl.cpp
+@@ -503,8 +503,8 @@
+ }
+ void OpenGlDrawing::drawRect(const QRectF &rect, const OpenGlColors &colors, OpenGlTexture *texture, qreal alpha, qreal selected, qreal croppingMode, bool ninePatch, QRectF partialTextureRect) {
+ QRectF textureRect, targetRect = rect;
+- alpha = qBound(0., alpha, 1.);
+- selected = qBound(0., selected, 1.);
++ alpha = qBound(qreal(0.), alpha, qreal(1.));
++ selected = qBound(qreal(0.), selected, qreal(1.));
+
+ //Cropping
+ if(!colors.isColorTransparent()) {
+@@ -716,7 +716,7 @@
+ //painter->drawStaticText(QPointF(0, 0), staticText);
+ //qDebug("%s\tH:%f\tC:%f\tSH:%f\tPOS:%f", qPrintable(text), rect.height(), rect.center().y(), staticText.size().height(), rect.center().y() - staticText.size().height()/2);
+ if((font.alignementFlags() & Qt::AlignVCenter) == Qt::AlignVCenter)
+- pos.setY(qMax(0., rect.center().y() - fontHeight/2));
++ pos.setY(qMax(qreal(0.), rect.center().y() - fontHeight/2));
+ else if((font.alignementFlags() & Qt::AlignBottom) == Qt::AlignBottom)
+ pos.setY(rect.bottom() - fontHeight);
+
+--- iannix.orig/geometry/nxeasing.h
++++ iannix/geometry/nxeasing.h
+@@ -38,7 +38,7 @@
+ public:
+ inline void setType(quint16 type) { easing.setType((QEasingCurve::Type)type); }
+ inline quint16 getType() const { return easing.type(); }
+- inline qreal getValue(qreal progress) const { return qBound(0., easing.valueForProgress(progress), 1.); }
++ inline qreal getValue(qreal progress) const { return qBound(qreal(0.), easing.valueForProgress(progress), qreal(1.)); }
+ };
+
+ #endif // NXEASING_H
+--- iannix.orig/geometry/qmuparser/muParserDef.h
++++ iannix/geometry/qmuparser/muParserDef.h
+@@ -49,7 +49,9 @@
+ This datatype must be a built in value type. You can not use custom classes.
+ It should be working with all types except "int"!
+ */
+-#define MUP_BASETYPE double
++#ifndef MUP_BASETYPE
++# define MUP_BASETYPE double
++#endif /* MUP_BASETYPE */
+
+ /** \brief Activate this option in order to compile with OpenMP support.
+
+--- iannix.orig/objects/nxcursor.cpp
++++ iannix/objects/nxcursor.cpp
+@@ -290,10 +290,10 @@
+ else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
+ else color = Qt::gray;
+ }
+- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
+- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
+- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
+- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
++ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
++ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
++ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
++ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
+
+ if(color.alpha() > 0) {
+ //Mouse hover
+@@ -408,7 +408,7 @@
+ glRotatef(cursorAngle.z(), 0, 0, 1);
+ glRotatef(cursorAngle.y(), 0, 1, 0);
+ glRotatef(cursorAngle.x(), 1, 0, 0);
+- qreal size2 = Render::objectSize / 2 * qMin(1., width);
++ qreal size2 = Render::objectSize / 2 * qMin(qreal(1.), width);
+ glBegin(GL_TRIANGLE_FAN);
+ glLineWidth(2);
+ if(hasActivity) {
+--- iannix.orig/objects/nxcurve.cpp
++++ iannix/objects/nxcurve.cpp
+@@ -155,10 +155,10 @@
+ else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
+ else color = Qt::gray;
+ }
+- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
+- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
+- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
+- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
++ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
++ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
++ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
++ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
+
+ if(color.alpha() > 0) {
+ //Mouse hover
+--- iannix.orig/objects/nxtrigger.cpp
++++ iannix/objects/nxtrigger.cpp
+@@ -61,10 +61,10 @@
+ else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
+ else color = Qt::gray;
+ }
+- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
+- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
+- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
+- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
++ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
++ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
++ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
++ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
+
+ //Size of trigger
+ if(cacheSize != Render::objectSize*size) {
diff --git a/debian/patches/series b/debian/patches/series
index 1d124d6..f518c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix_resources_path.patch
fix_spelling_errors.patch
+qreal-not-double.patch
--
iannix packaging
More information about the pkg-multimedia-commits
mailing list