gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

x11-themes/qtcurve: Fix broken isnan patch

Browse Source 
Gentoo-Bug: 593472
This commit is contained in:
Tobias Klausmann
2016-09-19 19:48:51 +02:00
parent 1224f5e0fb
commit 1ebced79f9
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
View File

@@ -1,22 +1,31 @@
Index: qtcurve-1.8.18/lib/utils/color.h
===================================================================
--- qtcurve-1.8.18.orig/lib/utils/color.h
+++ qtcurve-1.8.18/lib/utils/color.h
@@ -250,7 +250,7 @@ qtcColorTint(const QColor *base, const Q
diff --git a/lib/utils/color.h.orig b/lib/utils/color.h
index 2c7081f..37d83b5 100644
--- a/lib/utils/color.h.orig
+++ b/lib/utils/color.h
@@ -23,6 +23,8 @@
#ifndef QTC_UTILS_COLOR_H
#define QTC_UTILS_COLOR_H
+#include <math.h>
+
#include "utils.h"
#include "options.h"
@@ -250,7 +252,7 @@ qtcColorTint(const QColor *base, const QColor *col, double amount)
return *base;
} else if (amount >= 1.0) {
return *col;
- } else if (isnan(amount)) {
+ } else if (std::isnan(amount)) {
+ } else if (isnan(amount)) {
return *base;
}
const QtcColor qtc_base = {base->redF(), base->greenF(), base->blueF()};
@@ -267,7 +267,7 @@ qtcColorMix(const QColor *c1, const QCol
@@ -267,7 +269,7 @@ qtcColorMix(const QColor *c1, const QColor *c2, double bias)
return *c1;
} else if (bias >= 1.0) {
return *c2;
- } else if (isnan(bias)) {
+ } else if (std::isnan(bias)) {
+ } else if (isnan(bias)) {
return *c1;
}
const QtcColor qtc_c1 = {c1->redF(), c1->greenF(), c1->blueF()};