diff options
| author | joerg <joerg@pkgsrc.org> | 2020-03-27 20:58:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-03-27 20:58:12 +0000 |
| commit | e7112696f12ca77d4643d994f38eba5b64f045da (patch) | |
| tree | d0319b56e2bcf566d0d1ed17d175d726ca448149 /editors | |
| parent | 885b78961fd92f1a8ec22efbbd0fa421dca3696d (diff) | |
| download | pkgsrc-e7112696f12ca77d4643d994f38eba5b64f045da.tar.gz | |
Resolve conflicting type resolution for std::abs.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/obby/distinfo | 3 | ||||
| -rw-r--r-- | editors/obby/patches/patch-src_colour.cpp | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/editors/obby/distinfo b/editors/obby/distinfo index 0bb3067d7e9..cf499cefa34 100644 --- a/editors/obby/distinfo +++ b/editors/obby/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2016/02/10 08:09:37 mef Exp $ +$NetBSD: distinfo,v 1.5 2020/03/27 20:58:12 joerg Exp $ SHA1 (obby-0.4.8.tar.gz) = 49de7813bb56b249d2e6f0b6b014ae3b850d8987 RMD160 (obby-0.4.8.tar.gz) = 9b45340938cd0a85e379deab553be7396851366b SHA512 (obby-0.4.8.tar.gz) = 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0 Size (obby-0.4.8.tar.gz) = 530525 bytes SHA1 (patch-aa) = 044bf10cfa88475b8d2d25d349bf1c01cd853b05 +SHA1 (patch-src_colour.cpp) = 6def696ab0de7ccc8b034972a9738283e9b60fa6 diff --git a/editors/obby/patches/patch-src_colour.cpp b/editors/obby/patches/patch-src_colour.cpp new file mode 100644 index 00000000000..ba9246a53a6 --- /dev/null +++ b/editors/obby/patches/patch-src_colour.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_colour.cpp,v 1.1 2020/03/27 20:58:12 joerg Exp $ + +--- src/colour.cpp.orig 2020-03-27 18:01:51.643167816 +0000 ++++ src/colour.cpp +@@ -47,9 +47,9 @@ unsigned int obby::colour::get_blue() co + bool obby::colour::similar_colour(const colour& colour) const + { + // TODO: Convert to HSV for better checking +- return abs(m_red - colour.m_red) + +- abs(m_green - colour.m_green) + +- abs(m_blue - colour.m_blue) < 32; ++ return abs(int(m_red - colour.m_red)) + ++ abs(int(m_green - colour.m_green)) + ++ abs(int(m_blue - colour.m_blue)) < 32; + } + + std::string serialise::default_context_to<obby::colour>:: |