From 8aac2256eda12b23c1d5fa237fc496f77ac5af1c Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Tue, 17 Jan 2012 20:50:49 -0800
Subject: [PATCH] Fix zero width lines.

---
 src/canvas.js               |  19 +++++++++++++++++--
 test/pdfs/.gitignore        |   1 +
 test/pdfs/zerowidthline.pdf | Bin 0 -> 6569 bytes
 test/test_manifest.json     |   7 +++++++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test/pdfs/zerowidthline.pdf

diff --git a/src/canvas.js b/src/canvas.js
index 4feac4efe..5ef900861 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -48,6 +48,7 @@ var CanvasExtraState = (function CanvasExtraStateClosure() {
     // Note: fill alpha applies to all non-stroking operations
     this.fillAlpha = 1;
     this.strokeAlpha = 1;
+    this.lineWidth = 1;
 
     this.old = old;
   }
@@ -329,6 +330,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
 
     // Graphics state
     setLineWidth: function canvasGraphicsSetLineWidth(width) {
+      this.current.lineWidth = width;
       this.ctx.lineWidth = width;
     },
     setLineCap: function canvasGraphicsSetLineCap(style) {
@@ -442,6 +444,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
       var ctx = this.ctx;
       var strokeColor = this.current.strokeColor;
+      if (this.current.lineWidth === 0)
+        ctx.lineWidth = this.getSinglePixelWidth();
       // For stroke we want to temporarily change the global alpha to the
       // stroking alpha.
       ctx.globalAlpha = this.current.strokeAlpha;
@@ -640,7 +644,6 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         ctx.translate(current.x, current.y);
 
         ctx.scale(textHScale, 1);
-        ctx.lineWidth /= current.textMatrix[0];
 
         if (textSelection) {
           this.save();
@@ -677,7 +680,15 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       } else {
         ctx.save();
         this.applyTextTransforms();
-        ctx.lineWidth /= current.textMatrix[0] * fontMatrix[0];
+
+        var lineWidth = current.lineWidth;
+        var scale = Math.abs(current.textMatrix[0] * fontMatrix[0]);
+        if (scale == 0 || lineWidth == 0)
+          lineWidth = this.getSinglePixelWidth();
+        else
+          lineWidth /= scale;
+
+        ctx.lineWidth = lineWidth;
 
         if (textSelection)
           text.geom = this.getTextGeometry();
@@ -1142,6 +1153,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     },
     restoreFillRule: function canvasGraphicsRestoreFillRule(rule) {
       this.ctx.mozFillRule = rule;
+    },
+    getSinglePixelWidth: function getSinglePixelWidth(scale) {
+      var inverse = this.ctx.mozCurrentTransformInverse;
+      return Math.abs(inverse[0] + inverse[2]);
     }
   };
 
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index 956980782..1aae82800 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -22,3 +22,4 @@
 !issue918.pdf
 !smaskdim.pdf
 !type4psfunc.pdf
+!zerowidthline.pdf
diff --git a/test/pdfs/zerowidthline.pdf b/test/pdfs/zerowidthline.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..379f18049e93e41061057f67d6fc22c780828d85
GIT binary patch
literal 6569
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
YO1%m@hiNmP#^KK?fv&E#8~Ow90!C8humAu6

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index 6d04597d8..ebbcad7c5 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -417,5 +417,12 @@
       "rounds": 1,
       "link": true,
       "type": "eq"
+    },
+    {  "id": "zerowidthline",
+      "file": "pdfs/zerowidthline.pdf",
+      "md5": "295d26e61a85635433f8e4b768953f60",
+      "rounds": 1,
+      "link": false,
+      "type": "eq"
     }
 ]