From 9c37d95627f75dc300fd0af5df6c87d6ad92e363 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 30 Mar 2018 19:22:23 +0200
Subject: [PATCH] Fix #52070: imagedashedline() - dashed line sometimes is not
 visible

We finally remove the inadvertent leftover from the synchronization
with GD 2.0.12.
---
 NEWS                       |   4 ++++
 ext/gd/libgd/gd.c          |   1 -
 ext/gd/tests/bug52070.phpt |  25 +++++++++++++++++++++++++
 ext/gd/tests/bug52070.png  | Bin 0 -> 2223 bytes
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 ext/gd/tests/bug52070.phpt
 create mode 100644 ext/gd/tests/bug52070.png

diff --git a/NEWS b/NEWS
index 078ed2470b9..caccc939126 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ PHP                                                                        NEWS
     too long). (Jacob Hipps)
   . Fixed incorrect write to getenv result in FPM reload. (Jakub Zelenka)
 
+- GD:
+  . Fixed bug #52070 (imagedashedline() - dashed line sometimes is not visible).
+    (cmb)
+
 - mbstring:
   . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
   . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index 8d1e48dce5c..a6c3d393b28 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -1392,7 +1392,6 @@ void gdImageDashedLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color
 		} else {
 			wid = 1;
 		}
-		wid = (int)(thick * sin(atan2(dy, dx)));
 		vert = 1;
 
 		d = 2 * dy - dx;
diff --git a/ext/gd/tests/bug52070.phpt b/ext/gd/tests/bug52070.phpt
new file mode 100644
index 00000000000..acf56e6b5b2
--- /dev/null
+++ b/ext/gd/tests/bug52070.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #52070 (imagedashedline() - dashed line sometimes is not visible)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+$im = imagecreate(1200, 800);
+$background_color = imagecolorallocate($im, 40, 40, 40);
+$color = imagecolorallocate($im, 255, 255, 255);
+imagedashedline($im, 800, 400, 300, 400, $color);
+imagedashedline($im, 800, 400, 300, 800, $color);
+imagedashedline($im, 800, 400, 400, 800, $color);
+imagedashedline($im, 800, 400, 500, 800, $color);
+imagedashedline($im, 800, 400, 600, 800, $color);
+imagedashedline($im, 800, 400, 700, 800, $color);
+imagedashedline($im, 800, 400, 800, 800, $color);
+include_once __DIR__ . '/func.inc';
+test_image_equals_file(__DIR__ . '/bug52070.png', $im);
+?>
+===DONE===
+--EXPECT--
+The images are equal.
+===DONE===
diff --git a/ext/gd/tests/bug52070.png b/ext/gd/tests/bug52070.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce54b121bc2ed6f250dd98505cfafb50e48b9fc
GIT binary patch
literal 2223
zcmcIm`#TeCA6I%)dPwD1nCi*-EQA=b9I7GXozs@B(J+!j$jBqogcsQ!vcxd8p|KGa
zZ-|srPSY6WRI^5H&Zj-=y1akFd;f6X*ZsY(>vMgs&*$^K@B4up*ilOIxTKhvn3S`V
z!&Nb{eJ{ks#MSnQiz)~8588>A{ce{bAWcn8p-{*=vY9I;cHp|RgB>Kch&SrqTlP{e
zEkH8|=tnOteAR?IZxvBSRU>%!xK{`6@dkMnw3>C?eWpE-*|$zwEkGMaT}r6UKCIm&
zEyDeOj5Y71b*}3X-j?T^8yb}xb)xAwLwtzM5KqtnTiLRKAS=5b9<WrUWX@G6!#iM_
zos<!?Z!4+Eg167JZBkVFLv9+Nj@(`u(_|?HC${`PEqWYtw+R5YvK!tGCmrL-$O(;=
zD1ZfdWb`yUBPLCSbRwc(+AU~VfiVbn`}QXN#{JP_G)2ndW-p9dvtTwmkVQj9pAME-
zgB8WxwM+tp&$;XryjOZ?y41(1Rp9>m!C!srr<;&u{umSTeXDN5G2{#|?eZLgy~#<6
zq&*ooDR>KAd-MrD1PraOy7P^U{obAbdR(_-z8Jd`W-v1Jtyl-Gga4HIo?K<JU^X@)
za71X{rg`%Hao6>{06Qk~T*~8k2g$(upEJ`<ep3+oy^n}D#l_@;oTj_q9k1v$>>*S^
zvpH&g(3EG;wVf~#h#{uUjYlfa1w@|mpe=ZeNlJLo_A1nQXQcKiZiBYl0>_$MF*;%P
zL6jMkk8>n#qo1=lf`|@y-ij!EfQmZJM{^&(>Zu=2by+PLeFyHk4N{}YQi_G<vRobI
zaFp?(A7KtfU+LmQ>n|Q56RdH!{?<Gb(SeYn>8%+C#2~DvoG(yI>W&_ooP^APt=cCb
zGd9ePQ6;T)+3VPW+u0Z$Vt2cXA2>)`-X>s4VL7|^`dDG`xWTLb=olB+l+W=D)1INB
z8S;ZjVgWP{T`>^vlfKKUv0IAIzB(@eh?nsl;qWb^qg)*#*@lLz`1tc;yOJm-#KkED
zI9eW-Q>v)`Udt~?Yh<ZZ+WPJ7h>p<q_-=6yf*Q~)mgu5+ldOy|kbSv`a{+uyu24n*
z`_D4&C7K!@(TViW=>zM&4iYh2LVvtACb`Ueb?aCYN6j+AtLzd5t?l)9W&cducq2#6
zC%~-LVfKt?)-JvB4&JYIHExQ&g=OVDQ$n29%-4*<Va)XK=BIjZvi8hxMIHF4<f7NC
z4$|sYPkt<Y5s|789eN<q@}AaU_A)fhSmgpWpmG0>Bkd(IEd331JW=UGlp>)d>y$0F
z^7K+lq7@|D^X6cQ(~UpnCyX{SEE8C@%z6Z7ljF8vr;s&pzSk!<(a+VMHg*1;I)L1l
zO1g3HGfn`ZK8NX&PUN`y20i*$Se8Lnt=01!f}`H{LZvd7qSy&@KgfK-*-aQAE5Z)R
zDF1i4=Dp80>{L=J^cRTOlzh1JTu>8Dbr#eugOr-p`$C6|f=%0D+M#fm)48l!PzdEd
z08W>GYzJ?2%VbQoM&y6Gp!+&-Ng;ZRj;h9#H?4eqIq{eNlQL9M=GqT>X&|B;?Q+GY
z=V^upS|w29%3yGSCqjvxp1`t1`m;yYhMj{or1(2!Piu&>NNiR0)rLxPNY~1)%h_al
z*|RTm%<{9+b$4nrG?t+pkafdefGc`n31K}#(6YsuQWy7Xbc1+j?SJ%ucuc}k*XfN~
zVowSjUY}=a2XBF7FuqQq^R8OU!+tA?Wz~+<&lRrxqO+6riRJD^RZHV>S2EiRgV14o
z!Jkc0cznRhoHvV#;X*H(pDM2J9mUrhB}U>?B9UXA0OHvE;a(S7vl%n8<=jJN+OJ(T
zi+cs7y`}_s!GK}+&NF>tG_uEFeq18Kvahb<7?<|O2#C!x4HfQPbJD*-Rzw&m&?hJU
z6Q$Z<?lWq=w4EtGXVwpxaC^X*9*864HKX!HSBZeEhs5YG>s-HW?~fALR%h3l08MJ1
zKY+&N-pcC}e4k6EOM2vJpc`IGA$J9ZGwavbwpkLq*9T~Tvx9)cvIq<iBd0R$*-Y`C
zOh4C#mZ%g6)C@xOU(GVKGFu@}L?{UARw=CTZm~ohi`B`(vb0r+NU6;h@d+sIGbeS_
z7x#HFyz9K;YD2YW+?Sw+>ij#l!g((NR4z;vk~`4whp|Z2Bv$QkJ>F+U@U&j&r`lB>
zvBDSNqfKQ(3P|N$1|A%~lh3_p-gA|;t(aZ&NnS%0Yag6oS%tAGC1$}TNfyD%Awo3e
zhf?@nSm)NR|9vD>0O5lUjCc!+pC9y7MZfcb4S^(n#?iZd$DsMHzO#`8s6DSH*&cM#
ziXn3cbaIn*rHe$15oizJ$0iE2FNuGj91lHC`7rBls)PL~Pim<oxcXMGyxco&vggP8
z^z0k8!SDD~1Zo&5=K(ppjxb{zKccijL>vE^kGsN>V4v`7^KKJTH7jPe*jU;Q`$Yhi
zMXvH>#uopST=`$u8|&ihHJka%T7-)hvAMo!+BBR(bmR86v95ZxKXsm5HEf>&wcmz|
z$)S!|Rmt2z9ogK#c&CY;vYOjJpGGz$y+N$5E{2<DME_T>Erq_MXYz2TRNn^U9qfye
z+C;_DH~oz8ho**P`?Q!|7G4(is5}FWAvt8D@nwGtdkJm=YPb89^XpFTT+;<SG+64I
z&hB7xfQsfgPa&PLZ~_3@Vl=<qmDiwSb_&1T5TE+N(^<NB3Ky{noy~}6tYVGygQ~Ak
zQ(S$y8hBb7DQO>-Dmkhp3WMAW;Km`Xj_FVEgt->`ke?U64xB9f{Y`KNfgP$ZT>I-E
D7F$KO

literal 0
HcmV?d00001