From 58b214eab360dbf1599fc9290d895a0dcdde36e7 Mon Sep 17 00:00:00 2001
From: Jani Pehkonen <janpe2@users.noreply.github.com>
Date: Tue, 28 Nov 2017 21:24:27 +0200
Subject: [PATCH] Fix inverted 1-bit images in SVG backend

---
 src/display/svg.js                  |  12 ++++++------
 test/pdfs/.gitignore                |   1 +
 test/pdfs/images_1bit_grayscale.pdf | Bin 0 -> 4573 bytes
 test/test_manifest.json             |   6 ++++++
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 test/pdfs/images_1bit_grayscale.pdf

diff --git a/src/display/svg.js b/src/display/svg.js
index 25353ebbb..16f3bc228 100644
--- a/src/display/svg.js
+++ b/src/display/svg.js
@@ -182,7 +182,7 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() {
     return idat;
   }
 
-  function encode(imgData, kind, forceDataSchema) {
+  function encode(imgData, kind, forceDataSchema, isMask) {
     var width = imgData.width;
     var height = imgData.height;
     var bitDepth, colorType, lineSize;
@@ -220,8 +220,8 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() {
       offsetLiterals += lineSize;
     }
 
-    if (kind === ImageKind.GRAYSCALE_1BPP) {
-      // inverting for B/W
+    if (kind === ImageKind.GRAYSCALE_1BPP && isMask) {
+      // inverting for image masks
       offsetLiterals = 0;
       for (y = 0; y < height; y++) {
         offsetLiterals++; // skipping predictor
@@ -265,10 +265,10 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() {
     return createObjectURL(data, 'image/png', forceDataSchema);
   }
 
-  return function convertImgDataToPng(imgData, forceDataSchema) {
+  return function convertImgDataToPng(imgData, forceDataSchema, isMask) {
     var kind = (imgData.kind === undefined ?
                 ImageKind.GRAYSCALE_1BPP : imgData.kind);
-    return encode(imgData, kind, forceDataSchema);
+    return encode(imgData, kind, forceDataSchema, isMask);
   };
 })();
 
@@ -1161,7 +1161,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
       var width = imgData.width;
       var height = imgData.height;
 
-      var imgSrc = convertImgDataToPng(imgData, this.forceDataSchema);
+      var imgSrc = convertImgDataToPng(imgData, this.forceDataSchema, !!mask);
       var cliprect = this.svgFactory.createElement('svg:rect');
       cliprect.setAttributeNS(null, 'x', '0');
       cliprect.setAttributeNS(null, 'y', '0');
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index bed1b9c37..95bcc0f9a 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -119,6 +119,7 @@
 !issue5084.pdf
 !issue8960_reduced.pdf
 !issue5202.pdf
+!images_1bit_grayscale.pdf
 !issue5280.pdf
 !issue5677.pdf
 !issue5954.pdf
diff --git a/test/pdfs/images_1bit_grayscale.pdf b/test/pdfs/images_1bit_grayscale.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4cf15c794663f8743ba99f445d7bcaa2511357c8
GIT binary patch
literal 4573
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
Oi9o?RIBX6J#Qqo5S?Hhu

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index 17b2d882e..3574afe65 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -2017,6 +2017,12 @@
        "type": "eq",
        "about": "Type1 font where Length1/Length2 are several orders of magnitude too large."
     },
+    {  "id": "images_1bit_grayscale",
+       "file": "pdfs/images_1bit_grayscale.pdf",
+       "md5": "e1c36a19563944891bd30cfc0199d07f",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "html5checker",
       "file": "pdfs/html5checker.pdf",
       "md5": "74bbd80d1e7eb5f2951582233ef9ebab",