From a9081653fc565eb72c3eb5142c17088cb162e7ce Mon Sep 17 00:00:00 2001
From: Daan Sprenkels <dsprenkels@gmail.com>
Date: Wed, 25 Nov 2015 08:44:06 +0100
Subject: [PATCH] shading-pattern: While drawing patterns, transform to the
 baseTransform first

---
 src/display/canvas.js   |   3 +++
 test/pdfs/.gitignore    |   1 +
 test/pdfs/issue6296.pdf | Bin 0 -> 2971 bytes
 test/test_manifest.json |   6 ++++++
 4 files changed, 10 insertions(+)
 create mode 100644 test/pdfs/issue6296.pdf

diff --git a/src/display/canvas.js b/src/display/canvas.js
index 679359fb0..7f4e09be0 100644
--- a/src/display/canvas.js
+++ b/src/display/canvas.js
@@ -1089,6 +1089,9 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
 
       if (isPatternFill) {
         ctx.save();
+        if (this.baseTransform) {
+          ctx.setTransform.apply(ctx, this.baseTransform);
+        }
         ctx.fillStyle = fillColor.getPattern(ctx, this);
         needRestore = true;
       }
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index 07d63728f..e3398eff9 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -181,6 +181,7 @@
 !issue6081.pdf
 !issue6069.pdf
 !issue6106.pdf
+!issue6296.pdf
 !bug1001080.pdf
 !issue6108.pdf
 !issue6113.pdf
diff --git a/test/pdfs/issue6296.pdf b/test/pdfs/issue6296.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..703b67e76ed4d06ea1f3fbf9b9491c5bc4d62bac
GIT binary patch
literal 2971
zcmb_e&2QsG6fXxZ7Ti|i2BSrlyV`YT#*UNNN?f(|rdw!sqqK-hQIQ;blA1am?|4Gf
z{u3a?ak(IR<;DSVfEx!cD~|jPNc;=Dah%ls5DQWrHJ!Y9AHVnMx8C==2Cdb#_22&b
z@;l8&1o6@5TDy(+Svrv?r~#A#?#78^0^x2FNanMUN6hoITnZLUwfU>Zhvc<&NY=JC
zzJ2xk<p<FZUw!t@_fH;tz4guI_Dk{pd(ZxO{p;FC4=%;!%eTc_Yd`(@?vE^uN^v+T
zlgg0#Z(CYPsb7IPJkJ>J2NQ;SEQ*6|K1V|W*OU~0#~NG;mP%wPxEda?oX<qaa&V+C
zczD3%5QD40xWf}J4zeI*h?)!Tr*pY`Ai*<4OZk2v!QT{7g#q*(oCHyvP7qZA8ff4<
z=t(75%+ZQe!d5C4F+^D5Mg{O3;g91eM?-C)@)&`J86c)gTPaFcqNU_cAcKTYmMThg
zJtl()ZV)Z9Q&G^ot^lt*)9{Oa4^hu6EwxHUh|0p%;}r%Kl(Gf}Eln{FDhRK<!-J-#
z>{V|oDH}MNbNyEREEShVi}0A0@T#0bxO;&V@q9=%0-xghc!j)3!4e;Z>q4f2Q2j3N
z%d{0{tZM49&%TI5HrU-(R4$@?s7x(BP*hMS-B}vSm_rSytN<v8B?J!*rI<0KzABh1
ziCfAoee?M=h*MBcRq>I+PI07)rYTd;D~TymTEbT<px_tDhA7QOQc;e2`^)a6R-JfW
z*+}ipIh6G&lW4>yaoW-U{`nUj#ZgE9)b5d9w!=>1XBUDUTs%JvFHS=z(l<S=y%|9N
zF=HNN#<*zn9I-s?Jlq-VcONQ-xjUa`Q-Fcy(<IH^c}FiqTsSK-)=|MCPdoZiua6|>
z$!RQ+S#xUCpw<&K7QvLAadC=ht)YWT5slq}-z^owua15qW#(dhc6L@fvua#SFm)UU
z6BC=J0USntp2}cur1^(nuK*Gst;Ev2R$!`ye2U{EOlt%$4f)`Xh_fP@%5X5^GuhE+
zvp8}`R@0)S)iA=56B?9`i9z5oqLw+bX*0AK4VUJ!3e0Qv-~tR<5C=H9FmIw+$V5lq
z?eC-A6Q0Y3eFWhkIxgM6FI145yQ2UJEyK_T9=FG%czo`|l=DnNZSd7F?L%t2rsdk^
zV?td*+V}=1Bp*a~V9dkV{|}-S&Wb1(hfosUR(?LsB!@9;)~LO(RS1;#ZLG3WiOYRQ
zD#&`he~;C4s)||hxjqkPQyB1j{{JbJ`_66@t^j8<kraIqg_tEwVap-G6c9(DJLX~<
zKvf4>mc(J8iXB5W>RuZzWh@is6<xQL$i*RvRTsHQkWM=K+=$pXm?cv8K1mDiXpxO1
z_7;ai4qxfIBUc3px*F1kS2M%Y&^<l(r|4=>!a(onXKD<>>H0oWc?~W*dgHE!egsop
z^#=r8b;ySAs`jGPw5e@cMQ7=R=)eXY_y&%$8#b<Y%A?i0Z!XwagN>)DsUfv^P{Xz@
z8;#MDW;yWARu4*-G}E%+t$3YAEDK)9H)zy`jp7CkytzfA)-4;P-hkcUhOA9sBe+3p
zn76SsO$hf5zSbQ!>^uCh8@Kh@&TU%b4w|DDzNK9$f;eFUmS2Pq;tSXYn+Oj$haF9A
z00{4;V~)z5anDD?HX&9WLfh(EP3p9oj^z{Lx2$d7p-#Q-Q18tg$7*}aWgujcT(jP6
MY3u7xUv#y90Dzr6%K!iX

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index 0afdd7737..0d4faefb7 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -2510,6 +2510,12 @@
        "link": true,
        "type": "eq"
     },
+    {  "id": "issue6296.pdf",
+       "file": "pdfs/issue6296.pdf",
+       "md5": "734e191aab1372e6fd7523ca7751fcf0",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue5549.pdf",
        "file": "pdfs/issue5549.pdf",
        "md5": "6c36df6ebc583c9e18aad0ad00d257b8",