From 4a9ff471c4707e1f95ec6b77c43c52c5dcd151bb Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 10 Mar 2015 13:07:09 +0100
Subject: [PATCH] Correctly detect the presence of the Adobe specific APP14
 JPEG marker (bug 1140761)

According to the specification, http://partners.adobe.com/public/developer/en/ps/sdk/5116.DCT_Filter.pdf#G3.851943, the content of the marker segment should begin with `Adobe`, and not `Adobe\x00` as the code currently look for.

Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1140761.
Fixes the colour conversion part of issues 4090 and 5623.
---
 src/core/jpg.js               | 4 ++--
 test/pdfs/bug1140761.pdf.link | 1 +
 test/test_manifest.json       | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 test/pdfs/bug1140761.pdf.link

diff --git a/src/core/jpg.js b/src/core/jpg.js
index ffa6462c9..ef321bd34 100644
--- a/src/core/jpg.js
+++ b/src/core/jpg.js
@@ -669,9 +669,9 @@ var JpegImage = (function jpegImage() {
             if (fileMarker === 0xFFEE) {
               if (appData[0] === 0x41 && appData[1] === 0x64 &&
                   appData[2] === 0x6F && appData[3] === 0x62 &&
-                  appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
+                  appData[4] === 0x65) { // 'Adobe'
                 adobe = {
-                  version: appData[6],
+                  version: (appData[5] << 8) | appData[6],
                   flags0: (appData[7] << 8) | appData[8],
                   flags1: (appData[9] << 8) | appData[10],
                   transformCode: appData[11]
diff --git a/test/pdfs/bug1140761.pdf.link b/test/pdfs/bug1140761.pdf.link
new file mode 100644
index 000000000..9ea6f8e10
--- /dev/null
+++ b/test/pdfs/bug1140761.pdf.link
@@ -0,0 +1 @@
+https://bugzilla.mozilla.org/attachment.cgi?id=8574416
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 21843bab2..ae42e4a27 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -1608,6 +1608,15 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "bug1140761",
+       "file": "pdfs/bug1140761.pdf",
+       "md5": "b74eced7634d4f248dc6265f8225d432",
+       "rounds": 1,
+       "link": true,
+       "firstPage": 1,
+       "lastPage": 1,
+       "type": "eq"
+    },
     {  "id": "bug1011159",
       "file": "pdfs/bug1011159.pdf",
       "md5": "4532e22deb92d4cd2992d0cfe255582a",