diff options
author | Jeroen Roovers <jer@gentoo.org> | 2017-12-02 21:31:46 +0100 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2017-12-02 21:32:01 +0100 |
commit | ef4b282b7f6609cd68aa9ce7b6e89333f0096b95 (patch) | |
tree | 4ae3024492bcfdf7e049fb7a6bd175bb39fb7932 /x11-misc/easystroke/files | |
parent | dev-python/clang-python: Enable python3* for all 5.0* versions (diff) | |
download | gentoo-ef4b282b7f6609cd68aa9ce7b6e89333f0096b95.tar.gz gentoo-ef4b282b7f6609cd68aa9ce7b6e89333f0096b95.tar.bz2 gentoo-ef4b282b7f6609cd68aa9ce7b6e89333f0096b95.zip |
x11-misc/easystroke: Rename internal function abs() (bug #638922).
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'x11-misc/easystroke/files')
-rw-r--r-- | x11-misc/easystroke/files/easystroke-0.6.0-abs.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch new file mode 100644 index 000000000000..9b4ab63828db --- /dev/null +++ b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch @@ -0,0 +1,45 @@ +--- a/handler.cc ++++ b/handler.cc +@@ -533,7 +533,7 @@ + virtual Grabber::State grab_mode() { return parent->grab_mode(); } + }; + +-static inline float abs(float x) { return x > 0 ? x : -x; } ++static inline float easystroke_abs(float x) { return x > 0 ? x : -x; } + + class AbstractScrollHandler : public Handler { + bool have_x, have_y; +@@ -559,7 +559,7 @@ + xstate->fake_click(b2); + } + static float curve(float v) { +- return v * exp(log(abs(v))/3); ++ return v * exp(log(easystroke_abs(v))/3); + } + protected: + void move_back() { +@@ -597,8 +597,8 @@ + offset_x += factor * curve(dx/dt)*dt/20.0; + offset_y += factor * curve(dy/dt)*dt/10.0; + int b1 = 0, n1 = 0, b2 = 0, n2 = 0; +- if (abs(offset_x) > 1.0) { +- n1 = (int)floor(abs(offset_x)); ++ if (easystroke_abs(offset_x) > 1.0) { ++ n1 = (int)floor(easystroke_abs(offset_x)); + if (offset_x > 0) { + b1 = 7; + offset_x -= n1; +@@ -607,10 +607,10 @@ + offset_x += n1; + } + } +- if (abs(offset_y) > 1.0) { +- if (abs(offset_y) < 1.0) ++ if (easystroke_abs(offset_y) > 1.0) { ++ if (easystroke_abs(offset_y) < 1.0) + return; +- n2 = (int)floor(abs(offset_y)); ++ n2 = (int)floor(easystroke_abs(offset_y)); + if (offset_y > 0) { + b2 = 5; + offset_y -= n2; |