From 95bc99f6980051618a093dff54288253143a23cc Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Sat, 16 Jun 2012 15:15:42 -0500
Subject: [PATCH 01/27] Initial JBIG2 code

---
 src/jbig2.js         | 520 +++++++++++++++++++++++++++++++++++++++++++
 src/parser.js        |   3 +-
 src/stream.js        |  37 +++
 src/worker_loader.js |   1 +
 test/test_slave.html |   1 +
 5 files changed, 561 insertions(+), 1 deletion(-)
 create mode 100644 src/jbig2.js

diff --git a/src/jbig2.js b/src/jbig2.js
new file mode 100644
index 000000000..d7fa36d13
--- /dev/null
+++ b/src/jbig2.js
@@ -0,0 +1,520 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Jbig2Image = (function Jbig2ImageClosure() {
+
+  var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
+    var QeTable = [
+      {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
+      {qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0},
+      {qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0},
+      {qe: 0x0AC1, nmps: 4, nlps: 12, switchFlag: 0},
+      {qe: 0x0521, nmps: 5, nlps: 29, switchFlag: 0},
+      {qe: 0x0221, nmps: 38, nlps: 33, switchFlag: 0},
+      {qe: 0x5601, nmps: 7, nlps: 6, switchFlag: 1},
+      {qe: 0x5401, nmps: 8, nlps: 14, switchFlag: 0},
+      {qe: 0x4801, nmps: 9, nlps: 14, switchFlag: 0},
+      {qe: 0x3801, nmps: 10, nlps: 14, switchFlag: 0},
+      {qe: 0x3001, nmps: 11, nlps: 17, switchFlag: 0},
+      {qe: 0x2401, nmps: 12, nlps: 18, switchFlag: 0},
+      {qe: 0x1C01, nmps: 13, nlps: 20, switchFlag: 0},
+      {qe: 0x1601, nmps: 29, nlps: 21, switchFlag: 0},
+      {qe: 0x5601, nmps: 15, nlps: 14, switchFlag: 1},
+      {qe: 0x5401, nmps: 16, nlps: 14, switchFlag: 0},
+      {qe: 0x5101, nmps: 17, nlps: 15, switchFlag: 0},
+      {qe: 0x4801, nmps: 18, nlps: 16, switchFlag: 0},
+      {qe: 0x3801, nmps: 19, nlps: 17, switchFlag: 0},
+      {qe: 0x3401, nmps: 20, nlps: 18, switchFlag: 0},
+      {qe: 0x3001, nmps: 21, nlps: 19, switchFlag: 0},
+      {qe: 0x2801, nmps: 22, nlps: 19, switchFlag: 0},
+      {qe: 0x2401, nmps: 23, nlps: 20, switchFlag: 0},
+      {qe: 0x2201, nmps: 24, nlps: 21, switchFlag: 0},
+      {qe: 0x1C01, nmps: 25, nlps: 22, switchFlag: 0},
+      {qe: 0x1801, nmps: 26, nlps: 23, switchFlag: 0},
+      {qe: 0x1601, nmps: 27, nlps: 24, switchFlag: 0},
+      {qe: 0x1401, nmps: 28, nlps: 25, switchFlag: 0},
+      {qe: 0x1201, nmps: 29, nlps: 26, switchFlag: 0},
+      {qe: 0x1101, nmps: 30, nlps: 27, switchFlag: 0},
+      {qe: 0x0AC1, nmps: 31, nlps: 28, switchFlag: 0},
+      {qe: 0x09C1, nmps: 32, nlps: 29, switchFlag: 0},
+      {qe: 0x08A1, nmps: 33, nlps: 30, switchFlag: 0},
+      {qe: 0x0521, nmps: 34, nlps: 31, switchFlag: 0},
+      {qe: 0x0441, nmps: 35, nlps: 32, switchFlag: 0},
+      {qe: 0x02A1, nmps: 36, nlps: 33, switchFlag: 0},
+      {qe: 0x0221, nmps: 37, nlps: 34, switchFlag: 0},
+      {qe: 0x0141, nmps: 38, nlps: 35, switchFlag: 0},
+      {qe: 0x0111, nmps: 39, nlps: 36, switchFlag: 0},
+      {qe: 0x0085, nmps: 40, nlps: 37, switchFlag: 0},
+      {qe: 0x0049, nmps: 41, nlps: 38, switchFlag: 0},
+      {qe: 0x0025, nmps: 42, nlps: 39, switchFlag: 0},
+      {qe: 0x0015, nmps: 43, nlps: 40, switchFlag: 0},
+      {qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0},
+      {qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0},
+      {qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0},
+      {qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0}
+    ];
+
+    function ArithmeticDecoder(data, start, end) {
+      this.data = data;
+      this.bp = start;
+      this.dataEnd = end;
+
+      this.chigh = data[start];
+      this.clow = 0;
+
+      this.byteIn();
+
+      this.chigh = ((this.chigh << 7) & 0xFFFF) | ((this.clow >> 9) & 0x7F);
+      this.clow = (this.clow << 7) & 0xFFFF;
+      this.ct -= 7;
+      this.a = 0x8000;
+    }
+
+    ArithmeticDecoder.prototype = {
+      byteIn: function ArithmeticDecoder_byteIn() {
+        var data = this.data;
+        var bp = this.bp;
+        if (data[bp] == 0xFF) {
+          var b1 = data[bp + 1];
+          if (b1 > 0x8F) {
+            this.clow += 0xFF00;
+            this.ct = 8;
+          } else {
+            bp++;
+            this.clow += (data[bp] << 9);
+            this.ct = 7;
+            this.bp = bp;
+          }
+        } else {
+          bp++;
+          this.clow += bp < this.dataEnd ? (data[bp] << 8) : 0xFF00;
+          this.ct = 8;
+          this.bp = bp;
+        }
+        if (this.clow > 0xFFFF) {
+          this.chigh += (this.clow >> 16);
+          this.clow &= 0xFFFF;
+        }
+      },
+      readBit: function ArithmeticDecoder_readBit(cx) {
+        var qeIcx = QeTable[cx.index].qe;
+        this.a -= qeIcx;
+
+        if (this.chigh < qeIcx) {
+          var d = this.exchangeLps(cx);
+          this.renormD();
+          return d;
+        } else {
+          this.chigh -= qeIcx;
+          if ((this.a & 0x8000) == 0) {
+            var d = this.exchangeMps(cx);
+            this.renormD();
+            return d;
+          } else {
+            return cx.mps;
+          }
+        }
+      },
+      renormD: function ArithmeticDecoder_renormD() {
+        do {
+          if (this.ct == 0)
+            this.byteIn();
+
+          this.a <<= 1;
+          this.chigh = ((this.chigh << 1) & 0xFFFF) | ((this.clow >> 15) & 1);
+          this.clow = (this.clow << 1) & 0xFFFF;
+          this.ct--;
+        } while ((this.a & 0x8000) == 0);
+      },
+      exchangeMps: function ArithmeticDecoder_exchangeMps(cx) {
+        var d;
+        var qeTableIcx = QeTable[cx.index];
+        if (this.a < qeTableIcx.qe) {
+          d = 1 - cx.mps;
+
+          if (qeTableIcx.switchFlag == 1) {
+            cx.mps = 1 - cx.mps;
+          }
+          cx.index = qeTableIcx.nlps;
+        } else {
+          d = cx.mps;
+          cx.index = qeTableIcx.nmps;
+        }
+        return d;
+      },
+      exchangeLps: function ArithmeticDecoder_exchangeLps(cx) {
+        var d;
+        var qeTableIcx = QeTable[cx.index];
+        if (this.a < qeTableIcx.qe) {
+          this.a = qeTableIcx.qe;
+          d = cx.mps;
+          cx.index = qeTableIcx.nmps;
+        } else {
+          this.a = qeTableIcx.qe;
+          d = 1 - cx.mps;
+
+          if (qeTableIcx.switchFlag == 1) {
+            cx.mps = 1 - cx.mps;
+          }
+          cx.index = qeTableIcx.nlps;
+        }
+        return d;
+      }
+    };
+
+    return ArithmeticDecoder;
+  })();
+
+  var SegmentTypes = [
+    'SymbolDictionary', null, null, null, 'IntermediateTextRegion', null,
+    'ImmediateTextRegion', 'ImmediateLosslessTextRegion', null, null, null,
+    null, null, null, null, null, 'patternDictionary', null, null, null,
+    'IntermediateHalftoneRegion', null, 'ImmediateHalftoneRegion',
+    'ImmediateLosslessHalftoneRegion', null, null, null, null, null, null, null,
+    null, null, null, null, null, 'IntermediateGenericRegion', null,
+    'ImmediateGenericRegion', 'ImmediateLosslessGenericRegion',
+    'IntermediateGenericRefinementRegion', null,
+    'ImmediateGenericRefinementRegion',
+    'ImmediateLosslessGenericRefinementRegion', null, null, null, null,
+    'PageInformation', 'EndOfPage', 'EndOfStripe', 'EndOfFile', 'Profiles',
+    'Tables', null, null, null, null, null, null, null, null,
+    'Extension'
+  ];
+
+  var CodingTemplates = [
+    [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
+     {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: 2, y: -1},
+     {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}],
+    [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
+     {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: 2, y: -1},
+     {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}],
+    [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -1, y: -1},
+     {x: 0, y: -1}, {x: 1, y: -1}, {x: -2, y: 0}, {x: -1, y: 0}],
+    [{x: -3, y: -1}, {x: -2, y: -1}, {x: -1, y: -1}, {x: 0, y: -1},
+     {x: 1, y: -1}, {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}]
+  ];
+
+  var ReusedContexts = [
+    0x1CD3, // '00111001101' (template) + '0011' (at),
+    0x079A, // '001111001101' + '0',
+    0x00E3, // '001110001' + '1',
+    0x018B  // '011000101' + '1'
+  ];
+
+  function readInt32(data, start) {
+    return (data[start] << 24) | (data[start + 1] << 16) |
+           (data[start + 2] << 8) | data[start + 3];
+  }
+
+  function readUint32(data, start) {
+    var value = readInt32(data, start);
+    return value & 0x80000000 ? (value + 4294967296) : value;
+  }
+
+  function readUint16(data, start) {
+    return (data[start] << 8) | data[start + 1];
+  }
+
+  function readInt8(data, start) {
+    return (data[start] << 24) >> 24;
+  }
+
+  function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
+                        data, start, end) {
+    if (mmr)
+      throw 'MMR encoding is not supported';
+
+    var useskip = !!skip;
+    var template = CodingTemplates[templateIndex].concat(at);
+    var templateLength = template.length;
+    var templateX = new Int32Array(templateLength);
+    var templateY = new Int32Array(templateLength);
+    for (var k = 0; k < templateLength; k++) {
+      templateX[k] = template[k].x;
+      templateY[k] = template[k].y;
+    }
+    var pseudoPixelContext = ReusedContexts[template];
+    var bitmap = [];
+    var decoder = new ArithmeticDecoder(data, start, end);
+    var contexts = [], cx;
+    var ltp = 0;
+    for (var i = 0; i < height; i++) {
+      if (prediction) {
+        cx = contexts[pseudoPixelContext];
+        if (!cx)
+          contexts[pseudoPixelContext] = cx = {index: 0, mps: 0};
+        var sltp = decoder.readBit(cx);
+        ltp ^= sltp;
+      }
+      if (ltp) {
+        bitmap.push(bitmap[bitmap.length - 1]); // duplicate previous row
+        continue;
+      }
+      var row = new Uint8Array(width);
+      bitmap.push(row);
+      for (var j = 0; j < width; j++) {
+        if (useskip && skip[i][j]) {
+          row[j] = 0;
+          continue;
+        }
+        var contextLabel = 0;
+        for (var k = 0; k < templateLength; k++) {
+          var i0 = i + templateY[k], j0 = j + templateX[k];
+          if (i0 < 0 || j0 < 0 || j0 >= width)
+            contextLabel <<= 1; // out of bound pixel
+          else
+            contextLabel = (contextLabel << 1) | bitmap[i0][j0];
+        }
+        cx = contexts[contextLabel];
+        if (!cx)
+          contexts[contextLabel] = cx = {index: 0, mps: 0};
+        var pixel = decoder.readBit(cx);
+        row[j] = pixel;
+      }
+    }
+    return bitmap;
+  }
+
+  function readSegmentHeader(data, start) {
+    var segmentHeader = {};
+    segmentHeader.number = readUint32(data, start);
+    var flags = data[start + 4];
+    var segmentType = flags & 0x3F;
+    if (!SegmentTypes[segmentType])
+      throw 'Invalid segment type: ' + segmentType;
+    segmentHeader.type = segmentType;
+    segmentHeader.typeName = SegmentTypes[segmentType];
+    segmentHeader.deferredNonRetain = !!(flags & 0x80);
+    var pageAssociationFieldSize = !!(flags & 0x40);
+    var referredFlags = data[start + 5];
+    var referredToCount = (referredFlags >> 5) & 7;
+    var retainBits = [referredFlags & 31];
+    var position = start + 6;
+    if (referredFlags == 7) {
+      referredToCount = readInt32(data, position - 1) & 0x1FFFFFFF;
+      position += 3;
+      var bytes = (referredToCount + 7) >> 3;
+      retainBits[0] = data[position++];
+      while (--bytes > 0) {
+        retainBits.push(data[position++]);
+      }
+    } else if (referredFlags == 5 || referredFlags == 6)
+      throw 'Invalid referred-to flags';
+    segmentHeader.referredToCount = referredToCount;
+    segmentHeader.retainBits = retainBits;
+    var referredToSegmentNumberSize = segmentHeader.number <= 256 ? 1 :
+      segmentHeader.number <= 65536 ? 2 : 4;
+    var referredTo = [];
+    for (var i = 0; i < referredToCount; i++) {
+      var number = referredToSegmentNumberSize == 1 ? data[position] :
+        referredToSegmentNumberSize == 2 ? readUint16(data, position) :
+        readUint32(data, position);
+      referredTo.push(number);
+      position += referredToSegmentNumberSize;
+    }
+    segmentHeader.referredTo = referredTo;
+    if (!pageAssociationFieldSize)
+      segmentHeader.pageAssociation = data[position++];
+    else {
+      segmentHeader.pageAssociation = readUint32(data, position);
+      position += 4;
+    }
+    segmentHeader.length = readUint32(data, position);
+    if (segmentHeader.length == 0xFFFFFFFF)
+      throw 'Unsupported unknown segment length';
+    position += 4;
+    segmentHeader.headerEnd = position;
+    return segmentHeader;
+  }
+
+  function readSegments(header, data, start, end) {
+    var segments = [];
+    var position = start;
+    while (position < end) {
+      var segmentHeader = readSegmentHeader(data, position);
+      position = segmentHeader.headerEnd;
+      var segment = {
+        header: segmentHeader,
+        data: data
+      };
+      if (!header.randomAccess) {
+        segment.start = position;
+        position += segmentHeader.length;
+        segment.end = position;
+      }
+      segments.push(segment);
+      if (segmentHeader.type == 51)
+        break; // end of file is found
+    }
+    if (header.randomAccess) {
+      for (var i = 0; i < segments.length; i++) {
+        segments[i].start = position;
+        position += segments[i].header.length;
+        segments[i].end = position;
+      }
+    }
+    return segments;
+  }
+
+  function readRegionSegmentInformation(data, start) {
+    return {
+      width: readUint32(data, start),
+      height: readUint32(data, start + 4),
+      x: readUint32(data, start + 8),
+      y: readUint32(data, start + 12),
+      combinationOperator: data[start + 16] & 7
+    };
+  }
+  var RegionSegmentInformationFieldLength = 17;
+
+  function processSegment(segment, visitor) {
+    var header = segment.header;
+    if (!(header.typeName in visitor))
+      return;
+
+    var data = segment.data, position = segment.start, args;
+    switch (header.type) {
+      case 38: // ImmediateGenericRegion
+        var genericRegion = {};
+        genericRegion.info = readRegionSegmentInformation(data, position);
+        position += RegionSegmentInformationFieldLength;
+        var genericRegionSegmentFlags = data[position++];
+        genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
+        genericRegion.template = (genericRegionSegmentFlags >> 1) & 3;
+        genericRegion.prediction = !!(genericRegionSegmentFlags & 4);
+        if (!genericRegion.mmr) {
+          var atLength = genericRegion.template == 0 ? 4 : 1;
+          var at = [];
+          for (var i = 0; i < atLength; i++) {
+            at.push({
+              x: readInt8(data, position),
+              y: readInt8(data, position + 1)
+            });
+            position += 2;
+          }
+          genericRegion.at = at;
+        }
+        args = [genericRegion, data, position, segment.end];
+        break;
+      case 48: // PageInformation
+        var pageInfo = {
+          width: readUint32(data, position),
+          height: readUint32(data, position + 4),
+          resolutionX: readUint32(data, position + 8),
+          resolutionY: readUint32(data, position + 12)
+        };
+        if (pageInfo.height == 0xFFFFFFFF)
+          delete pageInfo.height;
+        var pageSegmentFlags = data[position + 16];
+        var pageStripingInformatiom = readUint16(data, position + 17);
+        pageInfo.lossless = !!(pageSegmentFlags & 1);
+        pageInfo.refinement = !!(pageSegmentFlags & 2);
+        pageInfo.defaultPixelValue = (pageSegmentFlags >> 2) & 1;
+        pageInfo.combinationOperator = (pageSegmentFlags >> 3) & 3;
+        pageInfo.requiresBuffer = !!(pageSegmentFlags & 32);
+        pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
+        args = [pageInfo];
+        break;
+      case 51: // EndOfFile
+        break;
+      default:
+        throw 'Segment type is not implemented: ' +
+              header.type + '/' + header.typeName;
+    }
+    visitor[header.typeName].apply(visitor, args);
+  }
+
+  function processSegments(segments, visitor) {
+    for (var i = 0; i < segments.length; i++)
+      processSegment(segments[i], visitor);
+  }
+
+  function parseJbig2(data, start, end) {
+    var position = start;
+    if (data[position] != 0x97 || data[position + 1] != 0x4A ||
+        data[position + 2] != 0x42 || data[position + 3] != 0x32 ||
+        data[position + 4] != 0x0D || data[position + 5] != 0x0A ||
+        data[position + 6] != 0x1A || data[position + 7] != 0x0A)
+      throw 'JBIG2 invalid header';
+    var header = {};
+    position += 8;
+    var flags = data[position++];
+    header.randomAccess = !(flags & 1);
+    if (!(flags & 2)) {
+      header.numberOfPages = readUint32(data, position);
+      position += 4;
+    }
+    var segments = readSegments(header, data, position, end);
+    // processSegments(segments, new SimpleSegmentVisitor());
+  }
+
+  function parseJbig2Chunk(data, start, end) {
+    var segments = readSegments({}, data, start, end);
+    var visitor = new SimpleSegmentVisitor();
+    processSegments(segments, visitor);
+    return visitor.buffer;
+  }
+
+  function SimpleSegmentVisitor() {
+    this.PageInformation = function(info) {
+      this.currentPageInfo = info;
+      var rowSize = (info.width + 7) >> 3;
+      var buffer = new Uint8Array(rowSize * info.height);
+      var fill = info.defaultPixelValue ? 0xFF : 0;
+      for (var i = 0; i < buffer.length; i++)
+        buffer[i] = fill;
+      this.buffer = buffer;
+    };
+    this.ImmediateGenericRegion = function(region, data, start, end) {
+      var regionInfo = region.info, pageInfo = this.currentPageInfo;
+      var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
+                                region.template, region.prediction, null,
+                                region.at, data, start, end);
+      var width = regionInfo.width, height = regionInfo.height;
+      var rowSize = (pageInfo.width + 7) >> 3;
+      var operator = pageInfo.combinationOperatorOverride ?
+        regionInfo.combinationOperator : pageInfo.combinationOperator;
+      var buffer = this.buffer;
+      for (var i = 0; i < height; i++) {
+        var mask = 128 >> (regionInfo.x & 7);
+        var offset = (i + regionInfo.y) * rowSize + (regionInfo.x >> 3);
+        switch (operator) {
+          case 0: // OR
+            for (var j = 0; j < width; j++) {
+              buffer[offset] |= bitmap[i][j] ? mask : 0;
+              mask >>= 1;
+              if (!mask) {
+                mask = 128;
+                offset++;
+              }
+            }
+            break;
+          case 2: // XOR
+            for (var j = 0; j < width; j++) {
+              buffer[offset] ^= bitmap[i][j] ? mask : 0;
+              mask >>= 1;
+              if (!mask) {
+                mask = 128;
+                offset++;
+              }
+            }
+            break;
+          default:
+            throw 'Unimplemented operator: ' + operator;
+        }
+      }
+    };
+  }
+
+  function Jbig2Image() {}
+
+  Jbig2Image.prototype = {
+    parseChunk: function Jbig2Image_parseChunk(data, start, end) {
+      return parseJbig2Chunk(data, start, end);
+    }
+  };
+
+  return Jbig2Image;
+})();
diff --git a/src/parser.js b/src/parser.js
index 6c9b4e67f..52f9eb1b0 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -253,7 +253,8 @@ var Parser = (function ParserClosure() {
         return new RunLengthStream(stream);
       }
       if (name == 'JBIG2Decode') {
-        error('JBIG2 image format is not currently supprted.');
+        var bytes = stream.getBytes(length);
+        return new Jbig2Stream(bytes, stream.dict);
       }
       warn('filter "' + name + '" not supported yet');
       return stream;
diff --git a/src/stream.js b/src/stream.js
index b0e1beb34..47704ea98 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -979,6 +979,43 @@ var JpxStream = (function JpxStreamClosure() {
   return JpxStream;
 })();
 
+/**
+ * For JBIG2's we use a library to decode these images and
+ * the stream behaves like all the other DecodeStreams.
+ */
+var Jbig2Stream = (function Jbig2StreamClosure() {
+  function Jbig2Stream(bytes, dict) {
+    this.dict = dict;
+    this.bytes = bytes;
+
+    DecodeStream.call(this);
+  }
+
+  Jbig2Stream.prototype = Object.create(DecodeStream.prototype);
+
+  Jbig2Stream.prototype.ensureBuffer = function Jbig2Stream_ensureBuffer(req) {
+    if (this.bufferLength)
+      return;
+
+    var jbig2Image = new Jbig2Image();
+
+    var data = jbig2Image.parseChunk(this.bytes, 0, this.bytes.length);
+    var dataLength = data.length;
+
+    // JBIG2 had black as 1 and white as 0, inverting the colors
+    for (var i = 0; i < dataLength; i++)
+      data[i] ^= 0xFF;
+
+    this.buffer = data;
+    this.bufferLength = dataLength;
+  };
+  Jbig2Stream.prototype.getChar = function Jbig2Stream_getChar() {
+    error('internal error: getChar is not valid on Jbig2Stream');
+  };
+
+  return Jbig2Stream;
+})();
+
 var DecryptStream = (function DecryptStreamClosure() {
   function DecryptStream(str, decrypt) {
     this.str = str;
diff --git a/src/worker_loader.js b/src/worker_loader.js
index 6d92a95e7..66a83f325 100644
--- a/src/worker_loader.js
+++ b/src/worker_loader.js
@@ -24,6 +24,7 @@ var files = [
   'stream.js',
   'worker.js',
   'jpx.js',
+  'jbig2.js',
   'bidi.js',
   '../external/jpgjs/jpg.js'
 ];
diff --git a/test/test_slave.html b/test/test_slave.html
index 7c2097110..a704f27ee 100644
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -24,6 +24,7 @@
     <script type="text/javascript" src="/src/worker.js"></script>
     <script type="text/javascript" src="/external/jpgjs/jpg.js"></script>
     <script type="text/javascript" src="/src/jpx.js"></script>
+    <script type="text/javascript" src="/src/jbig2.js"></script>
     <script type="text/javascript" src="/src/bidi.js"></script>
     <script type="text/javascript" src="driver.js"></script>
 

From 3c874c9bb759284ea580db3a56d6dc80a080631e Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 18 Jun 2012 09:48:47 -0700
Subject: [PATCH 02/27] Change to priority rendering.

---
 src/api.js    |  24 +++-
 web/viewer.js | 357 +++++++++++++++++++++++++++-----------------------
 2 files changed, 214 insertions(+), 167 deletions(-)

diff --git a/src/api.js b/src/api.js
index 7d65f96b4..2ab23bdde 100644
--- a/src/api.js
+++ b/src/api.js
@@ -234,7 +234,11 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
      * {
      *   canvasContext(required): A 2D context of a DOM Canvas object.,
      *   textLayer(optional): An object that has beginLayout, endLayout, and
-     *                        appendText functions.
+     *                        appendText functions.,
+     *   continueCallback(optional): A function that will be called each time
+     *                               the rendering is paused.  To continue
+     *                               rendering call the function that is the
+     *                               first argument to the callback.
      * }.
      * @return {Promise} A promise that is resolved when the page finishes
      * rendering.
@@ -270,6 +274,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
         else
           promise.resolve();
       };
+      var continueCallback = params.continueCallback;
 
       // Once the operatorList and fonts are loaded, do the actual rendering.
       this.displayReadyPromise.then(
@@ -282,7 +287,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
           var gfx = new CanvasGraphics(params.canvasContext,
             this.objs, params.textLayer);
           try {
-            this.display(gfx, params.viewport, complete);
+            this.display(gfx, params.viewport, complete, continueCallback);
           } catch (e) {
             complete(e);
           }
@@ -340,7 +345,8 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * For internal use only.
      */
-    display: function PDFPageProxy_display(gfx, viewport, callback) {
+    display: function PDFPageProxy_display(gfx, viewport, callback,
+                                           continueCallback) {
       var stats = this.stats;
       stats.time('Rendering');
 
@@ -356,10 +362,16 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
         stepper.nextBreakPoint = stepper.getNextBreakPoint();
       }
 
+      var continueWrapper;
+      if (continueCallback)
+        continueWrapper = function() { continueCallback(next); }
+      else
+        continueWrapper = next;
+
       var self = this;
       function next() {
-        startIdx =
-          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
+        startIdx = gfx.executeOperatorList(operatorList, startIdx,
+                                           continueWrapper, stepper);
         if (startIdx == length) {
           gfx.endDrawing();
           stats.timeEnd('Rendering');
@@ -367,7 +379,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
           if (callback) callback();
         }
       }
-      next();
+      continueWrapper();
     },
     /**
      * @return {Promise} That is resolved with the a {string} that is the text
diff --git a/web/viewer.js b/web/viewer.js
index 29b57a948..040bf91b8 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -14,6 +14,13 @@ var kMinScale = 0.25;
 var kMaxScale = 4.0;
 var kImageDirectory = './images/';
 var kSettingsMemory = 20;
+var RenderingStates = {
+  INITIAL: 0,
+  RUNNING: 1,
+  PAUSED: 2,
+  FINISHED: 3
+};
+
 
 var mozL10n = document.mozL10n || document.webL10n;
 
@@ -83,36 +90,6 @@ var ProgressBar = (function ProgressBarClosure() {
   return ProgressBar;
 })();
 
-var RenderingQueue = (function RenderingQueueClosure() {
-  function RenderingQueue() {
-    this.items = [];
-  }
-
-  RenderingQueue.prototype = {
-    enqueueDraw: function RenderingQueueEnqueueDraw(item) {
-      if (!item.drawingRequired())
-        return; // as no redraw required, no need for queueing.
-
-      this.items.push(item);
-      if (this.items.length > 1)
-        return; // not first item
-
-      item.draw(this.continueExecution.bind(this));
-    },
-    continueExecution: function RenderingQueueContinueExecution() {
-      var item = this.items.shift();
-
-      if (this.items.length == 0)
-        return; // queue is empty
-
-      item = this.items[0];
-      item.draw(this.continueExecution.bind(this));
-    }
-  };
-
-  return RenderingQueue;
-})();
-
 var FirefoxCom = (function FirefoxComClosure() {
   return {
     /**
@@ -246,7 +223,6 @@ var Settings = (function SettingsClosure() {
 })();
 
 var cache = new Cache(kCacheSize);
-var renderingQueue = new RenderingQueue();
 var currentPageNumber = 1;
 
 var PDFView = {
@@ -258,15 +234,47 @@ var PDFView = {
   startedTextExtraction: false,
   pageText: [],
   container: null,
+  thumbnailContainer: null,
   initialized: false,
   fellback: false,
   pdfDocument: null,
+  sidebarOpen: false,
+  pageViewScroll: null,
+  thumbnailViewScroll: null,
+
   // called once when the document is loaded
   initialize: function pdfViewInitialize() {
-    this.container = document.getElementById('viewerContainer');
+    var container = this.container = document.getElementById('viewerContainer');
+    this.pageViewScroll = {};
+    this.watchScroll(container, this.pageViewScroll, updateViewarea);
+
+    var thumbnailContainer = this.thumbnailContainer =
+                             document.getElementById('thumbnailView');
+    this.thumbnailViewScroll = {};
+    this.watchScroll(thumbnailContainer, this.thumbnailViewScroll,
+                     this.renderHighestPriority.bind(this));
+
     this.initialized = true;
   },
 
+  // Helper function to keep track whether a div was scrolled up or down and
+  // then call a callback.
+  watchScroll: function pdfViewWatchScroll(viewAreaElement, state, callback) {
+    state.down = true;
+    state.lastY = viewAreaElement.scrollTop;
+    viewAreaElement.addEventListener('scroll', function webViewerScroll(evt) {
+      var currentY = viewAreaElement.scrollTop;
+      var lastY = state.lastY;
+      if (currentY > lastY)
+        state.down = true;
+      else if (currentY < lastY)
+        state.down = false;
+      // else do nothing and use previous value
+      state.lastY = currentY;
+      callback();
+    }, true);
+  },
+
   setScale: function pdfViewSetScale(val, resetAutoSettings) {
     if (val == this.currentScale)
       return;
@@ -610,7 +618,6 @@ var PDFView = {
       // when page is painted, using the image as thumbnail base
       pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
         thumbnailView.setImage(pageView.canvas);
-        preDraw();
       };
     }
 
@@ -735,6 +742,88 @@ var PDFView = {
     }
   },
 
+  renderHighestPriority: function pdfViewRenderHighestPriority() {
+    // Pages have a higher priority than thumbnails, so check them first.
+    var visiblePages = this.getVisiblePages();
+    var pageView = this.getHighestPriority(visiblePages, this.pages,
+                                           this.pageViewScroll.down);
+    if (pageView) {
+      this.renderView(pageView, 'page');
+      return;
+    }
+    // No pages needed rendering so check thumbnails.
+    if (this.sidebarOpen) {
+      var visibleThumbs = this.getVisibleThumbs();
+      var thumbView = this.getHighestPriority(visibleThumbs,
+                                              this.thumbnails,
+                                              this.thumbnailViewScroll.down);
+      if (thumbView)
+        this.renderView(thumbView, 'thumbnail');
+    }
+  },
+
+  getHighestPriority: function pdfViewGetHighestPriority(visibleViews, views,
+                                                         scrolledDown) {
+    // The state has changed figure out which page has the highest priority to
+    // render next (if any).
+    // Priority:
+    // 1 visible pages
+    // 2 if last scrolled down page after the visible pages
+    // 2 if last scrolled up page before the visible pages
+    var numVisible = visibleViews.length;
+    if (numVisible === 0) {
+      info('No visible views.');
+      return false;
+    }
+    for (var i = 0; i < numVisible; ++i) {
+      var view = visibleViews[i].view;
+      if (!this.isViewFinshed(view))
+        return view;
+    }
+
+    // All the visible views have rendered, try to render next/previous pages.
+    if (scrolledDown) {
+      var lastVisible = visibleViews[visibleViews.length - 1];
+      var nextPageIndex = lastVisible.id;
+      // ID's start at 1 so no need to add 1.
+      if (views[nextPageIndex] && !this.isViewFinshed(views[nextPageIndex]))
+        return views[nextPageIndex];
+    } else {
+      var previousPageIndex = visibleViews[0].id - 2;
+      if (views[previousPageIndex] &&
+          !this.isViewFinshed(views[previousPageIndex]))
+        return views[previousPageIndex];
+    }
+    // Everything that needs to be rendered has been.
+    return false;
+  },
+
+  isViewFinshed: function pdfViewNeedsRendering(view) {
+    return view.renderingState === RenderingStates.FINISHED;
+  },
+
+  // Render a page or thumbnail view. This calls the appropriate function based
+  // on the views state. If the view is already rendered it will return false.
+  renderView: function pdfViewRender(view, type) {
+    var state = view.renderingState;
+    switch (state) {
+      case RenderingStates.FINISHED:
+        return false;
+      case RenderingStates.PAUSED:
+        PDFView.highestPriorityPage = type + view.id;
+        view.resume();
+        break;
+      case RenderingStates.RUNNING:
+        PDFView.highestPriorityPage = type + view.id;
+        break;
+      case RenderingStates.INITIAL:
+        PDFView.highestPriorityPage = type + view.id;
+        view.draw(this.renderHighestPriority.bind(this));
+        break;
+    }
+    return true;
+  },
+
   search: function pdfViewStartSearch() {
     // Limit this function to run every <SEARCH_TIMEOUT>ms.
     var SEARCH_TIMEOUT = 250;
@@ -854,7 +943,7 @@ var PDFView = {
         outlineView.classList.add('hidden');
         searchView.classList.add('hidden');
 
-        updateThumbViewArea();
+        PDFView.renderHighestPriority();
         break;
 
       case 'outline':
@@ -904,63 +993,39 @@ var PDFView = {
   },
 
   getVisiblePages: function pdfViewGetVisiblePages() {
-    var pages = this.pages;
-    var kBottomMargin = 10;
-    var kTopPadding = 30;
-    var visiblePages = [];
-
-    var currentHeight = kTopPadding + kBottomMargin;
-    var container = this.container;
-    // Add 1px to the scrolltop to give a little wiggle room if the math is off,
-    // this won't be needed if we calc current page number based off the middle
-    // of the screen instead of the top.
-    var containerTop = container.scrollTop + 1;
-    for (var i = 1; i <= pages.length; ++i) {
-      var page = pages[i - 1];
-      var pageHeight = page.height + kBottomMargin;
-      if (currentHeight + pageHeight > containerTop)
-        break;
-
-      currentHeight += pageHeight;
-    }
-
-    var containerBottom = containerTop + container.clientHeight;
-    for (; i <= pages.length && currentHeight < containerBottom; ++i) {
-      var singlePage = pages[i - 1];
-      visiblePages.push({ id: singlePage.id, y: currentHeight,
-                          view: singlePage });
-      currentHeight += page.height + kBottomMargin;
-    }
-    return visiblePages;
+    return this.getVisibleElements(this.container,
+                                   this.pages);
   },
 
   getVisibleThumbs: function pdfViewGetVisibleThumbs() {
-    var thumbs = this.thumbnails;
-    var kBottomMargin = 15;
-    var visibleThumbs = [];
+    return this.getVisibleElements(this.thumbnailContainer,
+                                   this.thumbnails);
+  },
 
-    var view = document.getElementById('thumbnailView');
-    var currentHeight = kBottomMargin;
+  // Generic helper to find out what elements are visible within a scroll pane.
+  getVisibleElements: function pdfViewGetVisibleElements(scrollEl, views) {
+    var currentHeight = 0, view;
+    var top = scrollEl.scrollTop;
 
-    var top = view.scrollTop;
-    for (var i = 1; i <= thumbs.length; ++i) {
-      var thumb = thumbs[i - 1];
-      var thumbHeight = thumb.height * thumb.scaleY + kBottomMargin;
-      if (currentHeight + thumbHeight > top)
+    for (var i = 1; i <= views.length; ++i) {
+      view = views[i - 1];
+      currentHeight = view.el.offsetTop;
+      if (currentHeight + view.el.clientHeight > top)
         break;
-
-      currentHeight += thumbHeight;
+      currentHeight += view.el.clientHeight;
     }
 
-    var bottom = top + view.clientHeight;
-    for (; i <= thumbs.length && currentHeight < bottom; ++i) {
-      var singleThumb = thumbs[i - 1];
-      visibleThumbs.push({ id: singleThumb.id, y: currentHeight,
-                          view: singleThumb });
-      currentHeight += singleThumb.height * singleThumb.scaleY + kBottomMargin;
+    var visible = [];
+    var bottom = top + scrollEl.clientHeight;
+    for (; i <= views.length && currentHeight < bottom; ++i) {
+      view = views[i - 1];
+      currentHeight = view.el.offsetTop;
+      visible.push({ id: view.id, y: currentHeight,
+                     view: view });
+      currentHeight += view.el.clientHeight;
     }
 
-    return visibleThumbs;
+    return visible;
   },
 
   // Helper function to parse query string (e.g. ?param1=value&parm2=...).
@@ -985,10 +1050,13 @@ var PageView = function pageView(container, pdfPage, id, scale,
   this.scale = scale || 1.0;
   this.viewport = this.pdfPage.getViewport(this.scale);
 
+  this.renderingState = RenderingStates.INITIAL;
+  this.resume = null;
+
   var anchor = document.createElement('a');
   anchor.name = '' + this.id;
 
-  var div = document.createElement('div');
+  var div = this.el = document.createElement('div');
   div.id = 'pageContainer' + this.id;
   div.className = 'page';
 
@@ -1001,6 +1069,9 @@ var PageView = function pageView(container, pdfPage, id, scale,
   };
 
   this.update = function pageViewUpdate(scale) {
+    this.renderingState = RenderingStates.INITIAL;
+    this.resume = null;
+
     this.scale = scale || this.scale;
     var viewport = this.pdfPage.getViewport(this.scale);
 
@@ -1203,16 +1274,11 @@ var PageView = function pageView(container, pdfPage, id, scale,
       }, 0);
   };
 
-  this.drawingRequired = function() {
-    return !div.querySelector('canvas');
-  };
-
   this.draw = function pageviewDraw(callback) {
-    if (!this.drawingRequired()) {
-      this.updateStats();
-      callback();
-      return;
-    }
+    if (this.renderingState !== RenderingStates.INITIAL)
+      error('Must be in new state before drawing');
+
+    this.renderingState = RenderingStates.RUNNING;
 
     var canvas = document.createElement('canvas');
     canvas.id = 'page' + this.id;
@@ -1242,6 +1308,8 @@ var PageView = function pageView(container, pdfPage, id, scale,
 
     var self = this;
     function pageViewDrawCallback(error) {
+      self.renderingState = RenderingStates.FINISHED;
+
       if (self.loadingIconDiv) {
         div.removeChild(self.loadingIconDiv);
         delete self.loadingIconDiv;
@@ -1264,7 +1332,18 @@ var PageView = function pageView(container, pdfPage, id, scale,
     var renderContext = {
       canvasContext: ctx,
       viewport: this.viewport,
-      textLayer: textLayer
+      textLayer: textLayer,
+      continueCallback: function pdfViewcContinueCallback(cont) {
+        if (PDFView.highestPriorityPage !== 'page' + self.id) {
+          self.renderingState = RenderingStates.PAUSED;
+          self.resume = function resumeCallback() {
+            self.renderingState = RenderingStates.RUNNING;
+            cont();
+          };
+          return;
+        }
+        cont();
+      }
     };
     this.pdfPage.render(renderContext).then(
       function pdfPageRenderCallback() {
@@ -1307,7 +1386,7 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
   var scaleX = this.scaleX = (canvasWidth / pageWidth);
   var scaleY = this.scaleY = (canvasHeight / pageHeight);
 
-  var div = document.createElement('div');
+  var div = this.el = document.createElement('div');
   div.id = 'thumbnailContainer' + id;
   div.className = 'thumbnail';
 
@@ -1315,6 +1394,7 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
   container.appendChild(anchor);
 
   this.hasImage = false;
+  this.renderingState = RenderingStates.INITIAL;
 
   function getPageDrawContext() {
     var canvas = document.createElement('canvas');
@@ -1347,22 +1427,40 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
   };
 
   this.draw = function thumbnailViewDraw(callback) {
+    if (this.renderingState !== RenderingStates.INITIAL)
+      error('Must be in new state before drawing');
+
+    this.renderingState = RenderingStates.RUNNING;
     if (this.hasImage) {
       callback();
       return;
     }
 
+    var self = this;
     var ctx = getPageDrawContext();
     var drawViewport = pdfPage.getViewport(scaleX);
     var renderContext = {
       canvasContext: ctx,
-      viewport: drawViewport
+      viewport: drawViewport,
+      continueCallback: function(cont) {
+        if (PDFView.highestPriorityPage !== 'thumbnail' + self.id) {
+          self.renderingState = RenderingStates.PAUSED;
+          self.resume = function() {
+            self.renderingState = RenderingStates.RUNNING;
+            cont();
+          };
+          return;
+        }
+        cont();
+      }
     };
     pdfPage.render(renderContext).then(
       function pdfPageRenderCallback() {
+        self.renderingState = RenderingStates.FINISHED;
         callback();
       },
       function pdfPageRenderError(error) {
+        self.renderingState = RenderingStates.FINISHED;
         callback();
       }
     );
@@ -1372,7 +1470,7 @@ var ThumbnailView = function thumbnailView(container, pdfPage, id) {
   this.setImage = function thumbnailViewSetImage(img) {
     if (this.hasImage || !img)
       return;
-
+    this.renderingState = RenderingStates.FINISHED;
     var ctx = getPageDrawContext();
     ctx.drawImage(img, 0, 0, img.width, img.height,
                   0, 0, ctx.canvas.width, ctx.canvas.height);
@@ -1614,9 +1712,6 @@ window.addEventListener('load', function webViewerLoad(evt) {
     }
   });
 
-  var thumbsView = document.getElementById('thumbnailView');
-  thumbsView.addEventListener('scroll', updateThumbViewArea, true);
-
   var mainContainer = document.getElementById('mainContainer');
   var outerContainer = document.getElementById('outerContainer');
   mainContainer.addEventListener('transitionend', function(e) {
@@ -1633,56 +1728,19 @@ window.addEventListener('load', function webViewerLoad(evt) {
       this.classList.toggle('toggled');
       outerContainer.classList.add('sidebarMoving');
       outerContainer.classList.toggle('sidebarOpen');
-      updateThumbViewArea();
+      PDFView.sidebarOpen = outerContainer.classList.contains('sidebarOpen');
+      PDFView.renderHighestPriority();
     });
 
   PDFView.open(file, 0);
 }, true);
 
-/**
- * Render the next not yet visible page already such that it is
- * hopefully ready once the user scrolls to it.
- */
-function preDraw() {
-  var pages = PDFView.pages;
-  var visible = PDFView.getVisiblePages();
-  var last = visible[visible.length - 1];
-  // PageView.id is the actual page number, which is + 1 compared
-  // to the index in `pages`. That means, pages[last.id] is the next
-  // PageView instance.
-  if (pages[last.id] && pages[last.id].drawingRequired()) {
-    renderingQueue.enqueueDraw(pages[last.id]);
-    return;
-  }
-  // If there is nothing to draw on the next page, maybe the user
-  // is scrolling up, so, let's try to render the next page *before*
-  // the first visible page
-  if (pages[visible[0].id - 2]) {
-    renderingQueue.enqueueDraw(pages[visible[0].id - 2]);
-  }
-}
-
 function updateViewarea() {
   if (!PDFView.initialized)
     return;
   var visiblePages = PDFView.getVisiblePages();
-  var pageToDraw;
-  for (var i = 0; i < visiblePages.length; i++) {
-    var page = visiblePages[i];
-    var pageObj = PDFView.pages[page.id - 1];
 
-    pageToDraw |= pageObj.drawingRequired();
-    renderingQueue.enqueueDraw(pageObj);
-  }
-
-  if (!visiblePages.length)
-    return;
-
-  // If there is no need to draw a page that is currenlty visible, preDraw the
-  // next page the user might scroll to.
-  if (!pageToDraw) {
-    preDraw();
-  }
+  PDFView.renderHighestPriority();
 
   updateViewarea.inProgress = true; // used in "set page"
   var currentId = PDFView.page;
@@ -1713,29 +1771,6 @@ function updateViewarea() {
   document.getElementById('viewBookmark').href = href;
 }
 
-window.addEventListener('scroll', function webViewerScroll(evt) {
-  updateViewarea();
-}, true);
-
-var thumbnailTimer;
-
-function updateThumbViewArea() {
-  // Only render thumbs after pausing scrolling for this amount of time
-  // (makes UI more responsive)
-  var delay = 50; // in ms
-
-  if (thumbnailTimer)
-    clearTimeout(thumbnailTimer);
-
-  thumbnailTimer = setTimeout(function() {
-    var visibleThumbs = PDFView.getVisibleThumbs();
-    for (var i = 0; i < visibleThumbs.length; i++) {
-      var thumb = visibleThumbs[i];
-      renderingQueue.enqueueDraw(PDFView.thumbnails[thumb.id - 1]);
-    }
-  }, delay);
-}
-
 window.addEventListener('resize', function webViewerResize(evt) {
   if (PDFView.initialized &&
       (document.getElementById('pageWidthOption').selected ||

From ffc27bca1ef0b71c260da0db82fd3e48962119dc Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 18 Jun 2012 10:49:00 -0700
Subject: [PATCH 03/27] Fix missing charset for iframe.

---
 src/fonts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fonts.js b/src/fonts.js
index 72bcecbce..2e1702b9b 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -532,7 +532,7 @@ var FontLoader = {
 
       // XXX we should have a time-out here too, and maybe fire
       // pdfjsFontLoadFailed?
-      var src = '<!DOCTYPE HTML><html><head>';
+      var src = '<!DOCTYPE HTML><html><head><meta charset="utf-8">';
       src += '<style type="text/css">';
       for (var i = 0, ii = rules.length; i < ii; ++i) {
         src += rules[i];

From e09eb529d942423e09a6f5f98945d2786f0aa58f Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 18 Jun 2012 15:03:20 -0500
Subject: [PATCH 04/27] Adds  basic symbol dictionary and text region.

---
 src/jbig2.js    | 461 +++++++++++++++++++++++++++++++++++++++++++++---
 src/stream.js   |   9 +-
 web/viewer.html |   1 +
 3 files changed, 450 insertions(+), 21 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index d7fa36d13..c5661f5db 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -5,6 +5,7 @@
 
 var Jbig2Image = (function Jbig2ImageClosure() {
 
+  // Annex E. Arithmetic Coding
   var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
     var QeTable = [
       {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
@@ -167,6 +168,128 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return ArithmeticDecoder;
   })();
 
+  // Annex A. Arithmetic Integer Decoding Procedure
+  // A.2 Procedure for decoding values
+  function decodeInteger(contextCache, procedure, decoder) {
+    var contexts;
+    if (procedure in contextCache)
+      contexts = contextCache[procedure];
+    else
+      contextCache[procedure] = contexts = [];
+
+    var prev = 1;
+    var state = 1, v = 0, s;
+    var toRead = 32, offset = 4436; // defaults for state 7
+    while (state) {
+      var cx = contexts[prev];
+      if (!cx)
+        contexts[prev] = cx = {index: 0, mps: 0};
+      var bit = decoder.readBit(cx);
+      prev = prev < 256 ? (prev << 1) | bit :
+        (((prev << 1) | bit) & 511) | 256;
+      switch (state) {
+        case 1:
+          s = !!bit;
+          break;
+        case 2:
+          if (bit) break;
+          state = 7;
+          toRead = 2;
+          offset = 0;
+          break;
+        case 3:
+          if (bit) break;
+          state = 7;
+          toRead = 4;
+          offset = 4;
+          break;
+        case 4:
+          if (bit) break;
+          state = 7;
+          toRead = 6;
+          offset = 20;
+          break;
+        case 5:
+          if (bit) break;
+          state = 7;
+          toRead = 8;
+          offset = 84;
+          break;
+        case 6:
+          if (bit) break;
+          state = 7;
+          toRead = 12;
+          offset = 340;
+          break;
+        default:
+          v = v * 2 + bit;
+          if (--toRead == 0)
+            state = 0;
+          continue;
+      }
+      state++;
+    }
+    v += offset;
+    return !s ? v : v > 0 ? -v : null;
+  }
+  // A.3 The IAID decoding procedure
+  function decodeIAID(contextCache, decoder, codeLength) {
+    var contexts;
+    if ('IAID' in contextCache)
+      contexts = contextCache['IAID'];
+    else
+      contextCache['IAID'] = contexts = [];
+
+    var prev = 1;
+    for (var i = 0; i < codeLength; i++) {
+      var cx = contexts[prev];
+      if (!cx)
+        contexts[prev] = cx = {index: 0, mps: 0};
+      var bit = decoder.readBit(cx);
+      prev = (prev * 2) + bit;
+    }
+    if (codeLength < 31)
+      return prev & ((1 << codeLength) - 1);
+    else
+      return prev - Math.pow(2, codeLength);
+  }
+
+  // Annex B. Huffman Table Decoding Procedure
+  // B.5 Standard Huffman tables
+  function TableB1(reader) {
+    if (!reader.readBit())
+      return reader.readBits(4); // 0 + VAL
+    if (!reader.readBit())
+      return reader.readBits(8) + 16; // 10 + (VAL - 16)
+    if (!reader.readBit())
+      return reader.readBits(16) + 272; // 110 + (VAL - 272)
+    if (!reader.readBit())
+      return reader.readBits(32) + 65808; // 1110 + (VAL - 65808)
+  }
+
+  function TableB2(reader) {
+    if (!reader.readBit())
+      return 0; // 0
+    if (!reader.readBit())
+      return 1; // 10
+    if (!reader.readBit())
+      return 2; // 110
+    if (!reader.readBit())
+      return reader.readBits(3) + 3; // 1110 + (VAL - 3)
+    if (!reader.readBit())
+      return reader.readBits(6) + 11; // 11110 + (VAL - 11)
+    if (!reader.readBit())
+      return reader.readBits(32) + 75; // 111110 + (VAL - 75)
+    return null; // OOB
+  }
+
+  function TableB3(reader) {}
+
+  function TableB4(reader) {}
+
+  function TableB5(reader) {}
+
+  // 7.3 Segment types
   var SegmentTypes = [
     'SymbolDictionary', null, null, null, 'IntermediateTextRegion', null,
     'ImmediateTextRegion', 'ImmediateLosslessTextRegion', null, null, null,
@@ -203,6 +326,15 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     0x018B  // '011000101' + '1'
   ];
 
+  function log2(x) {
+    var n = 1, i = 0;
+    while (x > n) {
+      n <<= 1;
+      i++;
+    }
+    return i;
+  }
+
   function readInt32(data, start) {
     return (data[start] << 24) | (data[start + 1] << 16) |
            (data[start + 2] << 8) | data[start + 3];
@@ -221,6 +353,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return (data[start] << 24) >> 24;
   }
 
+  // 6.2
   function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
                         data, start, end) {
     if (mmr)
@@ -237,8 +370,18 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     }
     var pseudoPixelContext = ReusedContexts[template];
     var bitmap = [];
-    var decoder = new ArithmeticDecoder(data, start, end);
-    var contexts = [], cx;
+    var decoder, contexts, cx;
+    if (data instanceof ArithmeticDecoder) {
+      decoder = data;
+      var contextCache = start;
+      if ('GB' in contextCache)
+        contexts = contextCache['GB'];
+      else
+        contextCache['GB'] = contexts = [];
+    } else {
+      decoder = new ArithmeticDecoder(data, start, end);
+      contexts = [];
+    }
     var ltp = 0;
     for (var i = 0; i < height; i++) {
       if (prediction) {
@@ -277,6 +420,126 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return bitmap;
   }
 
+  // 6.5.5 Decoding the symbol dictionary
+  function decodeSymbolDictionary(huffman, refinement, symbols,
+                                  numberOfNewSymbols, numberOfExportedSymbols,
+                                  huffmanTables, templateIndex, at,
+                                  refinementTemplateIndex, refinementAt,
+                                  data, start, end) {
+    if (huffman)
+      throw 'huffman is not supported';
+    if (refinement)
+      throw 'refinement is not supported';
+
+    var newSymbols = [];
+    var currentHeight = 0;
+    var contextCache = {};
+    var decoder = new ArithmeticDecoder(data, start, end);
+    while (newSymbols.length < numberOfNewSymbols) {
+      var deltaHeight = decodeInteger(contextCache, 'IADH', decoder); // 6.5.6
+      currentHeight += deltaHeight;
+      var currentWidth = 0;
+      var totalWidth = 0;
+      while (true) {
+        var deltaWidth = decodeInteger(contextCache, 'IADW', decoder); // 6.5.7
+        if (deltaWidth == null)
+          break; // OOB
+        currentWidth += deltaWidth;
+        totalWidth += currentWidth;
+        // 6.5.8.1 Direct-coded symbol bitmap
+        var bitmap = decodeBitmap(false, currentWidth, currentHeight,
+          templateIndex, false, null, at, decoder, contextCache);
+        newSymbols.push(bitmap);
+      }
+    }
+    // 6.5.10 Exported symbols
+    var exportedSymbols = [];
+    var flags = [], currentFlag = false;
+    while (flags.length < symbols.length + numberOfNewSymbols) {
+      var runLength = decodeInteger(contextCache, 'IAEX', decoder);
+      while (runLength--)
+        flags.push(currentFlag);
+      currentFlag = !currentFlag;
+    }
+    for (var i = 0; i < symbols.length; i++)
+      if (flags[i]) exportedSymbols.push(symbols[i]);
+    for (var j = 0; j < numberOfNewSymbols; i++, j++)
+      if (flags[i]) exportedSymbols.push(newSymbols[j]);
+    return exportedSymbols;
+  }
+
+  function decodeTextRegion(huffman, refinement, width, height,
+                            defaultPixelValue, numberOfSymbolInstances,
+                            stripSize, inputSymbols, symbolCodeLength,
+                            transposed, dsOffset, referenceCorner,
+                            combinationOperator, huffmanTables,
+                            refinementTemplate, refinementAt,
+                            data, start, end) {
+    if (huffman)
+      throw 'huffman is not supported';
+    if (refinement)
+      throw 'refinement is not supported';
+
+    // Prepare bitmap
+    var bitmap = [];
+    for (var i = 0; i < height; i++) {
+      var row = new Uint8Array(width);
+      if (defaultPixelValue) {
+        for (var j = 0; j < width; j++)
+          row[j] = defaultPixelValue;
+      }
+      bitmap.push(row);
+    }
+
+    var contextCache = {};
+    var decoder = new ArithmeticDecoder(data, start, end);
+
+    if (transposed)
+      throw 'transposed!=0 is not supported';
+    if (combinationOperator != 0)
+      throw 'combinationOperator==' + combinationOperator + ' is not supported';
+
+    var stripT = -decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
+    var firstS = 0;
+    var i = 0;
+    while (i < numberOfSymbolInstances) {
+      var deltaT = decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
+      stripT += deltaT;
+
+      var deltaFirstS = decodeInteger(contextCache, 'IAFS', decoder); // 6.4.7
+      firstS += deltaFirstS;
+      var currentS = firstS;
+      do {
+        var currentT = stripSize == 1 ? 0 :
+          decodeInteger(contextCache, 'IAIT', decoder); // 6.4.9
+        var t = stripT + currentT;
+        var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
+
+        var symbolBitmap = inputSymbols[symbolId];
+        var symbolWidth = symbolBitmap[0].length;
+        var symbolHeight = symbolBitmap.length;
+        var offsetT = t - ((referenceCorner & 1) ? 0 : symbolHeight);
+        var offsetS = currentS - ((referenceCorner & 2) ? symbolWidth : 0);
+        for (var t2 = 0; t2 < symbolHeight; t2++) {
+          var row = bitmap[offsetT + t2];
+          if (!row) continue;
+          var symbolRow = symbolBitmap[t2];
+          for (var s2 = 0; s2 < symbolWidth; s2++)
+            row[offsetS + s2] |= symbolRow[s2];
+        }
+
+        currentS += symbolWidth - 1;
+        i++;
+
+        var deltaS = decodeInteger(contextCache, 'IADS', decoder); // 6.4.8
+        if (deltaS == null)
+          break; // OOB
+        currentS += deltaS + dsOffset;
+      } while (true);
+    }
+    return bitmap;
+  }
+
   function readSegmentHeader(data, start) {
     var segmentHeader = {};
     segmentHeader.number = readUint32(data, start);
@@ -302,7 +565,6 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       }
     } else if (referredFlags == 5 || referredFlags == 6)
       throw 'Invalid referred-to flags';
-    segmentHeader.referredToCount = referredToCount;
     segmentHeader.retainBits = retainBits;
     var referredToSegmentNumberSize = segmentHeader.number <= 256 ? 1 :
       segmentHeader.number <= 65536 ? 2 : 4;
@@ -358,6 +620,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return segments;
   }
 
+  // 7.4.1 Region segment information field
   function readRegionSegmentInformation(data, start) {
     return {
       width: readUint32(data, start),
@@ -374,8 +637,100 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     if (!(header.typeName in visitor))
       return;
 
-    var data = segment.data, position = segment.start, args;
+    var data = segment.data, position = segment.start, end = segment.end;
+    var args;
     switch (header.type) {
+      case 0: // SymbolDictionary
+        // 7.4.2 Symbol dictionary segment syntax
+        var dictionary = {};
+        var dictionaryFlags = readUint16(data, position); // 7.4.2.1.1
+        dictionary.huffman = !!(dictionaryFlags & 1);
+        dictionary.refinement = !!(dictionaryFlags & 2);
+        dictionary.huffmanDHSelector = (dictionaryFlags >> 2) & 3;
+        dictionary.huffmanDWSelector = (dictionaryFlags >> 4) & 3;
+        dictionary.bitmapSizeSelector = (dictionaryFlags >> 6) & 1;
+        dictionary.aggregationInstancesSelector = (dictionaryFlags >> 7) & 1;
+        dictionary.bitmapCodingContextUsed = !!(dictionaryFlags & 256);
+        dictionary.bitmapCodingContextRetained = !!(dictionaryFlags & 512);
+        dictionary.template = (dictionaryFlags >> 10) & 3;
+        dictionary.refinementTemplate = (dictionaryFlags >> 12) & 1;
+        position += 2;
+        if (!dictionary.huffman) {
+          var atLength = dictionary.template == 0 ? 4 : 1;
+          var at = [];
+          for (var i = 0; i < atLength; i++) {
+            at.push({
+              x: readInt8(data, position),
+              y: readInt8(data, position + 1)
+            });
+            position += 2;
+          }
+          dictionary.at = at;
+        }
+        if (dictionary.refinement && !dictionary.refinementTemplate) {
+          var at = [];
+          for (var i = 0; i < 2; i++) {
+            at.push({
+              x: readInt8(data, position),
+              y: readInt8(data, position + 1)
+            });
+            position += 2;
+          }
+          dictionary.refinementAt = at;
+        }
+        dictionary.numberOfExportedSymbols = readUint32(data, position);
+        position += 4;
+        dictionary.numberOfNewSymbols = readUint32(data, position);
+        position += 4;
+        args = [dictionary, header.number, header.referredTo,
+                data, position, end];
+        break;
+      case 6: // ImmediateTextRegion
+        var textRegion = {};
+        textRegion.info = readRegionSegmentInformation(data, position);
+        position += RegionSegmentInformationFieldLength;
+        var textRegionSegmentFlags = readUint16(data, position);
+        position += 2;
+        textRegion.huffman = !!(textRegionSegmentFlags & 1);
+        textRegion.refinement = !!(textRegionSegmentFlags & 2);
+        textRegion.stripSize = 1 << ((textRegionSegmentFlags >> 2) & 3);
+        textRegion.referenceCorner = (textRegionSegmentFlags >> 4) & 3;
+        textRegion.transposed = !!(textRegionSegmentFlags & 64);
+        textRegion.combinationOperator = (textRegionSegmentFlags >> 7) & 3;
+        textRegion.defaultPixelValue = (textRegionSegmentFlags >> 9) & 1;
+        textRegion.dsOffset = (textRegionSegmentFlags >> 10) & 31;
+        textRegion.refinementTemplate = (textRegionSegmentFlags >> 15) & 1;
+        if (textRegion.huffman) {
+          var textRegionHuffmanFlags = readUint16(data, position);
+          position += 2;
+          textRegion.huffmanFS = (textRegionHuffmanFlags) & 3;
+          textRegion.huffmanDS = (textRegionHuffmanFlags >> 2) & 3;
+          textRegion.huffmanDT = (textRegionHuffmanFlags >> 4) & 3;
+          textRegion.huffmanRefinementDW = (textRegionHuffmanFlags >> 6) & 3;
+          textRegion.huffmanRefinementDH = (textRegionHuffmanFlags >> 8) & 3;
+          textRegion.huffmanRefinementDX = (textRegionHuffmanFlags >> 10) & 3;
+          textRegion.huffmanRefinementDY = (textRegionHuffmanFlags >> 12) & 3;
+          textRegion.huffmanRefinementSizeSelector =
+            !!(textRegionHuffmanFlags & 14);
+        }
+        if (textRegion.refinement && !textRegion.refinementTemplate) {
+          var at = [];
+          for (var i = 0; i < 2; i++) {
+            at.push({
+              x: readInt8(data, position),
+              y: readInt8(data, position + 1)
+            });
+            position += 2;
+          }
+          dictionary.refinementAt = at;
+        }
+        textRegion.numberOfSymbolInstances = readUint32(data, position);
+        position += 4;
+        // TODO 7.4.3.1.7 Symbol ID Huffman table decoding
+        if (textRegion.huffman)
+          throw 'huffman is not supported';
+        args = [textRegion, header.referredTo, data, position, end];
+        break;
       case 38: // ImmediateGenericRegion
         var genericRegion = {};
         genericRegion.info = readRegionSegmentInformation(data, position);
@@ -396,7 +751,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           }
           genericRegion.at = at;
         }
-        args = [genericRegion, data, position, segment.end];
+        args = [genericRegion, data, position, end];
         break;
       case 48: // PageInformation
         var pageInfo = {
@@ -450,15 +805,20 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     // processSegments(segments, new SimpleSegmentVisitor());
   }
 
-  function parseJbig2Chunk(data, start, end) {
-    var segments = readSegments({}, data, start, end);
+  function parseJbig2Chunks(chunks) {
     var visitor = new SimpleSegmentVisitor();
-    processSegments(segments, visitor);
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      var segments = readSegments({}, chunk.data, chunk.start, chunk.end);
+      processSegments(segments, visitor);
+    }
     return visitor.buffer;
   }
 
-  function SimpleSegmentVisitor() {
-    this.PageInformation = function(info) {
+  function SimpleSegmentVisitor() {}
+
+  SimpleSegmentVisitor.prototype = {
+    PageInformation: function SimpleSegmentVisitor_PageInformation(info) {
       this.currentPageInfo = info;
       var rowSize = (info.width + 7) >> 3;
       var buffer = new Uint8Array(rowSize * info.height);
@@ -466,12 +826,9 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       for (var i = 0; i < buffer.length; i++)
         buffer[i] = fill;
       this.buffer = buffer;
-    };
-    this.ImmediateGenericRegion = function(region, data, start, end) {
-      var regionInfo = region.info, pageInfo = this.currentPageInfo;
-      var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
-                                region.template, region.prediction, null,
-                                region.at, data, start, end);
+    },
+    drawBitmap: function SimpleSegmentVisitor_drawBitmap(regionInfo, bitmap) {
+      var pageInfo = this.currentPageInfo;
       var width = regionInfo.width, height = regionInfo.height;
       var rowSize = (pageInfo.width + 7) >> 3;
       var operator = pageInfo.combinationOperatorOverride ?
@@ -505,14 +862,78 @@ var Jbig2Image = (function Jbig2ImageClosure() {
             throw 'Unimplemented operator: ' + operator;
         }
       }
-    };
-  }
+    },
+    ImmediateGenericRegion:
+      function SimpleSegmentVisitor_ImmediateGenericRegion(region, data,
+                                                           start, end) {
+      var regionInfo = region.info;
+      var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
+                                region.template, region.prediction, null,
+                                region.at, data, start, end);
+      this.drawBitmap(regionInfo, bitmap);
+    },
+    SymbolDictionary:
+      function SimpleSegmentVisitor_SymbolDictionary(dictionary, currentSegment,
+                                                     referredSegments,
+                                                     data, start, end) {
+      var symbols = this.symbols;
+      var huffmanTables;
+      if (dictionary.huffman) {
+        huffmanTables = {};
+        huffmanTables.DeltaHeights = dictionary.huffmanDHSelector == 0 ?
+          TableB4 : dictionary.huffmanDHSelector == 1 ? TableB5 :
+          this.userTable;
+        huffmanTables.DeltaWidths = dictionary.huffmanDHSelector == 0 ?
+          TableB2 : dictionary.huffmanDHSelector == 2 ? TableB3 :
+          this.userTable;
+        huffmanTables.BitmapSize = dictionary.huffmanBitmapSizeSelector == 0 ?
+          TableB1 : this.userTable;
+        huffmanTables.AggregationInstances =
+          dictionary.aggregationInstancesSelector == 0 ? TableB1 :
+          this.userTable;
+      }
+      // Combines exported symbols from all referred segments
+      var inputSymbols = [];
+      for (var i = 0; i < referredSegments.length; i++)
+        inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
+
+      if (!symbols)
+        this.symbols = symbols = {};
+      symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman,
+        dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols,
+        dictionary.numberOfExportedSymbols, huffmanTables,
+        dictionary.template, dictionary.at,
+        dictionary.refinementTemplate, dictionary.refinementAt,
+        data, start, end);
+    },
+    ImmediateTextRegion:
+      function SimpleSegmentVisitor_ImmediateTextRegion(region,
+                                                        referredSegments,
+                                                        data, start, end) {
+      var regionInfo = region.info;
+      var symbols = this.symbols;
+      var huffmanTables;
+      // Combines exported symbols from all referred segments
+      var inputSymbols = [];
+      for (var i = 0; i < referredSegments.length; i++)
+        inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
+      var symbolCodeLength = log2(inputSymbols.length);
+
+      var bitmap = decodeTextRegion(region.huffman, region.refinement,
+        regionInfo.width, regionInfo.height, region.defaultPixelValue,
+        region.numberOfSymbolInstances, region.stripSize, inputSymbols,
+        symbolCodeLength, region.transposed, region.dsOffset,
+        region.referenceCorner, region.combinationOperator, huffmanTables,
+        region.refinementTemplate, region.refinementAt, data, start, end);
+      this.drawBitmap(regionInfo, bitmap);
+    }
+  };
 
   function Jbig2Image() {}
 
   Jbig2Image.prototype = {
-    parseChunk: function Jbig2Image_parseChunk(data, start, end) {
-      return parseJbig2Chunk(data, start, end);
+    parseChunks: function Jbig2Image_parseChunks(chunks) {
+      return parseJbig2Chunks(chunks);
     }
   };
 
diff --git a/src/stream.js b/src/stream.js
index 47704ea98..5e4b3a47e 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -999,7 +999,14 @@ var Jbig2Stream = (function Jbig2StreamClosure() {
 
     var jbig2Image = new Jbig2Image();
 
-    var data = jbig2Image.parseChunk(this.bytes, 0, this.bytes.length);
+    var chunks = [], decodeParams = this.dict.get('DecodeParms');
+    if (decodeParams && decodeParams.has('JBIG2Globals')) {
+      var globalsStream = decodeParams.get('JBIG2Globals');
+      var globals = globalsStream.getBytes();
+      chunks.push({data: globals, start: 0, end: globals.length});
+    }
+    chunks.push({data: this.bytes, start: 0, end: this.bytes.length});
+    var data = jbig2Image.parseChunks(chunks);
     var dataLength = data.length;
 
     // JBIG2 had black as 1 and white as 0, inverting the colors
diff --git a/web/viewer.html b/web/viewer.html
index f76c3665f..b6c1795b8 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -35,6 +35,7 @@
     <script type="text/javascript" src="../src/worker.js"></script>  <!-- PDFJSSCRIPT_REMOVE_CORE -->
     <script type="text/javascript" src="../external/jpgjs/jpg.js"></script>  <!-- PDFJSSCRIPT_REMOVE_CORE -->
     <script type="text/javascript" src="../src/jpx.js"></script>  <!-- PDFJSSCRIPT_REMOVE_CORE -->
+    <script type="text/javascript" src="../src/jbig2.js"></script>  <!-- PDFJSSCRIPT_REMOVE_CORE -->
     <script type="text/javascript" src="../src/bidi.js"></script>  <!-- PDFJSSCRIPT_REMOVE_CORE -->
     <script type="text/javascript">PDFJS.workerSrc = '../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE_CORE -->
     <script type="text/javascript" src="debugger.js"></script>

From ed7a10a8d54f283dfd5b9e2ea061cac0fff5f0b7 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 18 Jun 2012 14:12:00 -0700
Subject: [PATCH 05/27] Remove unneeded scroll when we first load a page.

---
 web/viewer.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/viewer.js b/web/viewer.js
index 040bf91b8..2f012e456 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -275,7 +275,7 @@ var PDFView = {
     }, true);
   },
 
-  setScale: function pdfViewSetScale(val, resetAutoSettings) {
+  setScale: function pdfViewSetScale(val, resetAutoSettings, noScroll) {
     if (val == this.currentScale)
       return;
 
@@ -283,7 +283,7 @@ var PDFView = {
     for (var i = 0; i < pages.length; i++)
       pages[i].update(val * kCssUnits);
 
-    if (this.currentScale != val)
+    if (!noScroll && this.currentScale != val)
       this.pages[this.page - 1].scrollIntoView();
     this.currentScale = val;
 
@@ -294,14 +294,14 @@ var PDFView = {
     window.dispatchEvent(event);
   },
 
-  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
+  parseScale: function pdfViewParseScale(value, resetAutoSettings, noScroll) {
     if ('custom' == value)
       return;
 
     var scale = parseFloat(value);
     this.currentScaleValue = value;
     if (scale) {
-      this.setScale(scale, true);
+      this.setScale(scale, true, noScroll);
       return;
     }
 
@@ -313,22 +313,22 @@ var PDFView = {
                            currentPage.height * currentPage.scale / kCssUnits;
     switch (value) {
       case 'page-actual':
-        this.setScale(1, resetAutoSettings);
+        scale = 1;
         break;
       case 'page-width':
-        this.setScale(pageWidthScale, resetAutoSettings);
+        scale = pageWidthScale;
         break;
       case 'page-height':
-        this.setScale(pageHeightScale, resetAutoSettings);
+        scale = pageHeightScale;
         break;
       case 'page-fit':
-        this.setScale(
-            Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
+        scale = Math.min(pageWidthScale, pageHeightScale);
         break;
       case 'auto':
-        this.setScale(Math.min(1.0, pageWidthScale), resetAutoSettings);
+        scale = Math.min(1.0, pageWidthScale);
         break;
     }
+    this.setScale(scale, resetAutoSettings, noScroll);
 
     selectScaleOption(value);
   },
@@ -1245,9 +1245,9 @@ var PageView = function pageView(container, pdfPage, id, scale,
       }
 
       if (scale && scale !== PDFView.currentScale)
-        PDFView.parseScale(scale, true);
+        PDFView.parseScale(scale, true, true);
       else if (PDFView.currentScale === kUnknownScale)
-        PDFView.parseScale(kDefaultScale, true);
+        PDFView.parseScale(kDefaultScale, true, true);
 
       var boundingRect = [
         this.viewport.convertToViewportPoint(x, y),

From aa877e1d400a8c2392f38adce50af6cb575dceaa Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Thu, 21 Jun 2012 17:26:24 -0500
Subject: [PATCH 06/27] Implements refinement

---
 src/jbig2.js | 170 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 154 insertions(+), 16 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index c5661f5db..c2307c306 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -319,6 +319,19 @@ var Jbig2Image = (function Jbig2ImageClosure() {
      {x: 1, y: -1}, {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}]
   ];
 
+  var RefinementTemplates = [
+    {
+      coding: [{x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}],
+      reference: [{x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}, {x: 0, y: 0},
+                  {x: 1, y: 0}, {x: -1, y: 1}, {x: 0, y: 1}, {x: 1, y: 1}]
+    },
+    {
+      coding: [{x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: -1, y: 0}],
+      reference: [{x: 0, y: -1}, {x: -1, y: 0}, {x: 0, y: 0}, {x: 1, y: 0},
+                  {x: 0, y: 1}, {x: 1, y: 1}]
+    }
+  ];
+
   var ReusedContexts = [
     0x1CD3, // '00111001101' (template) + '0011' (at),
     0x079A, // '001111001101' + '0',
@@ -326,6 +339,11 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     0x018B  // '011000101' + '1'
   ];
 
+  var RefinementReusedContexts = [
+    0x0020, // '000' + '0' (coding) + '00010000' + '0' (reference)
+    0x0008  // '0000' + '001000'
+  ];
+
   function log2(x) {
     var n = 1, i = 0;
     while (x > n) {
@@ -353,7 +371,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return (data[start] << 24) >> 24;
   }
 
-  // 6.2
+  // 6.2 Generic Region Decoding Procedure
   function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
                         data, start, end) {
     if (mmr)
@@ -368,7 +386,8 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       templateX[k] = template[k].x;
       templateY[k] = template[k].y;
     }
-    var pseudoPixelContext = ReusedContexts[template];
+
+    var pseudoPixelContext = ReusedContexts[templateIndex];
     var bitmap = [];
     var decoder, contexts, cx;
     if (data instanceof ArithmeticDecoder) {
@@ -382,6 +401,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       decoder = new ArithmeticDecoder(data, start, end);
       contexts = [];
     }
+
     var ltp = 0;
     for (var i = 0; i < height; i++) {
       if (prediction) {
@@ -420,6 +440,90 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return bitmap;
   }
 
+  // 6.3.2 Generic Refinement Region Decoding Procedure
+  function decodeRefinement(width, height, templateIndex, referenceBitmap,
+                            offsetX, offsetY, prediction, at,
+                            data, start, end) {
+    var codingTemplate = RefinementTemplates[templateIndex].coding;
+    if (templateIndex == 0)
+      codingTemplate = codingTemplate.concat([at[0]]);
+    var codingTemplateLength = codingTemplate.length;
+    var codingTemplateX = new Int32Array(codingTemplateLength);
+    var codingTemplateY = new Int32Array(codingTemplateLength);
+    for (var k = 0; k < codingTemplateLength; k++) {
+      codingTemplateX[k] = codingTemplate[k].x;
+      codingTemplateY[k] = codingTemplate[k].y;
+    }
+    var referenceTemplate = RefinementTemplates[templateIndex].reference;
+    if (templateIndex == 0)
+      referenceTemplate = referenceTemplate.concat([at[1]]);
+    var referenceTemplateLength = referenceTemplate.length;
+    var referenceTemplateX = new Int32Array(referenceTemplateLength);
+    var referenceTemplateY = new Int32Array(referenceTemplateLength);
+    for (var k = 0; k < referenceTemplateLength; k++) {
+      referenceTemplateX[k] = referenceTemplate[k].x;
+      referenceTemplateY[k] = referenceTemplate[k].y;
+    }
+    var referenceWidth = referenceBitmap[0].length;
+    var referenceHeight = referenceBitmap.length;
+
+    var pseudoPixelContext = RefinementReusedContexts[templateIndex];
+    var bitmap = [];
+    var decoder, contexts, cx;
+    if (data instanceof ArithmeticDecoder) {
+      decoder = data;
+      var contextCache = start;
+      if ('GR' in contextCache)
+        contexts = contextCache['GR'];
+      else
+        contextCache['GR'] = contexts = [];
+    } else {
+      decoder = new ArithmeticDecoder(data, start, end);
+      contexts = [];
+    }
+
+    var ltp = 0;
+    for (var i = 0; i < height; i++) {
+      if (prediction) {
+        cx = contexts[pseudoPixelContext];
+        if (!cx)
+          contexts[pseudoPixelContext] = cx = {index: 0, mps: 0};
+        var sltp = decoder.readBit(cx);
+        ltp ^= sltp;
+      }
+      var row = new Uint8Array(width);
+      bitmap.push(row);
+      for (var j = 0; j < width; j++) {
+        if (ltp)
+          throw 'prediction is not supported';
+
+        var contextLabel = 0;
+        for (var k = 0; k < codingTemplateLength; k++) {
+          var i0 = i + codingTemplateY[k], j0 = j + codingTemplateX[k];
+          if (i0 < 0 || j0 < 0 || j0 >= width)
+            contextLabel <<= 1; // out of bound pixel
+          else
+            contextLabel = (contextLabel << 1) | bitmap[i0][j0];
+        }
+        for (var k = 0; k < referenceTemplateLength; k++) {
+          var i0 = i + referenceTemplateY[k] + offsetY;
+          var j0 = j + referenceTemplateX[k] + offsetX;
+          if (i0 < 0 || i0 >= referenceHeight || j0 < 0 || j0 >= referenceWidth)
+            contextLabel <<= 1; // out of bound pixel
+          else
+            contextLabel = (contextLabel << 1) | referenceBitmap[i0][j0];
+        }
+        cx = contexts[contextLabel];
+        if (!cx)
+          contexts[contextLabel] = cx = {index: 0, mps: 0};
+        var pixel = decoder.readBit(cx);
+        row[j] = pixel;
+      }
+    }
+
+    return bitmap;
+  }
+
   // 6.5.5 Decoding the symbol dictionary
   function decodeSymbolDictionary(huffman, refinement, symbols,
                                   numberOfNewSymbols, numberOfExportedSymbols,
@@ -428,12 +532,11 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                   data, start, end) {
     if (huffman)
       throw 'huffman is not supported';
-    if (refinement)
-      throw 'refinement is not supported';
 
     var newSymbols = [];
     var currentHeight = 0;
     var contextCache = {};
+    var symbolCodeLength = log2(symbols.length + numberOfNewSymbols);
     var decoder = new ArithmeticDecoder(data, start, end);
     while (newSymbols.length < numberOfNewSymbols) {
       var deltaHeight = decodeInteger(contextCache, 'IADH', decoder); // 6.5.6
@@ -446,9 +549,25 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           break; // OOB
         currentWidth += deltaWidth;
         totalWidth += currentWidth;
-        // 6.5.8.1 Direct-coded symbol bitmap
-        var bitmap = decodeBitmap(false, currentWidth, currentHeight,
-          templateIndex, false, null, at, decoder, contextCache);
+        var bitmap;
+        if (refinement) {
+          // 6.5.8.2 Refinement/aggregate-coded symbol bitmap
+          var numberOfInstances = decodeInteger(contextCache, 'IAAI', decoder);
+          if (numberOfInstances > 1)
+            throw 'number of instances > 1 is not supported';
+          var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
+          var rdx = decodeInteger(contextCache, 'IARDX', decoder); // 6.4.11.3
+          var rdy = decodeInteger(contextCache, 'IARDY', decoder); // 6.4.11.4
+          var symbol = symbolId < symbols.length ? symbols[symbolId] :
+            newSymbols[symbolId - symbols.length];
+          bitmap = decodeRefinement(currentWidth, currentHeight,
+            refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt,
+            decoder, contextCache);
+        } else {
+          // 6.5.8.1 Direct-coded symbol bitmap
+          bitmap = decodeBitmap(false, currentWidth, currentHeight,
+            templateIndex, false, null, at, decoder, contextCache);
+        }
         newSymbols.push(bitmap);
       }
     }
@@ -473,12 +592,10 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                             stripSize, inputSymbols, symbolCodeLength,
                             transposed, dsOffset, referenceCorner,
                             combinationOperator, huffmanTables,
-                            refinementTemplate, refinementAt,
+                            refinementTemplateIndex, refinementAt,
                             data, start, end) {
     if (huffman)
       throw 'huffman is not supported';
-    if (refinement)
-      throw 'refinement is not supported';
 
     // Prepare bitmap
     var bitmap = [];
@@ -496,7 +613,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
     if (transposed)
       throw 'transposed!=0 is not supported';
-    if (combinationOperator != 0)
+    if (combinationOperator != 0 && combinationOperator != 2)
       throw 'combinationOperator==' + combinationOperator + ' is not supported';
 
     var stripT = -decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
@@ -512,20 +629,41 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       do {
         var currentT = stripSize == 1 ? 0 :
           decodeInteger(contextCache, 'IAIT', decoder); // 6.4.9
-        var t = stripT + currentT;
+        var t = stripSize * stripT + currentT;
         var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
-
+        var applyRefinement = refinement &&
+          decodeInteger(contextCache, 'IARI', decoder);
         var symbolBitmap = inputSymbols[symbolId];
         var symbolWidth = symbolBitmap[0].length;
         var symbolHeight = symbolBitmap.length;
+        if (applyRefinement) {
+          var rdw = decodeInteger(contextCache, 'IARDW', decoder); // 6.4.11.1
+          var rdh = decodeInteger(contextCache, 'IARDH', decoder); // 6.4.11.2
+          var rdx = decodeInteger(contextCache, 'IARDX', decoder); // 6.4.11.3
+          var rdy = decodeInteger(contextCache, 'IARDY', decoder); // 6.4.11.4
+          symbolWidth += rdw;
+          symbolHeight += rdh;
+          symbolBitmap = decodeRefinement(symbolWidth, symbolHeight,
+            refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx,
+            (rdh >> 1) + rdy, false, refinementAt,
+            decoder, contextCache);
+        }
         var offsetT = t - ((referenceCorner & 1) ? 0 : symbolHeight);
         var offsetS = currentS - ((referenceCorner & 2) ? symbolWidth : 0);
         for (var t2 = 0; t2 < symbolHeight; t2++) {
           var row = bitmap[offsetT + t2];
           if (!row) continue;
           var symbolRow = symbolBitmap[t2];
-          for (var s2 = 0; s2 < symbolWidth; s2++)
-            row[offsetS + s2] |= symbolRow[s2];
+          switch (combinationOperator) {
+            case 0: // OR
+              for (var s2 = 0; s2 < symbolWidth; s2++)
+                row[offsetS + s2] |= symbolRow[s2];
+              break;
+            case 2: // XOR
+              for (var s2 = 0; s2 < symbolWidth; s2++)
+                row[offsetS + s2] ^= symbolRow[s2];
+              break;
+          }
         }
 
         currentS += symbolWidth - 1;
@@ -722,7 +860,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
             });
             position += 2;
           }
-          dictionary.refinementAt = at;
+          textRegion.refinementAt = at;
         }
         textRegion.numberOfSymbolInstances = readUint32(data, position);
         position += 4;

From 2e5414cd18e8c91e31a6428a8a5dceaa4d7f51a1 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 22 Jun 2012 00:50:04 -0500
Subject: [PATCH 07/27] Fixes template 2; implements end of stripe

---
 src/jbig2.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index c2307c306..40e286252 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -313,8 +313,9 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
      {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: 2, y: -1},
      {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}],
-    [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -1, y: -1},
-     {x: 0, y: -1}, {x: 1, y: -1}, {x: -2, y: 0}, {x: -1, y: 0}],
+    [{x: -1, y: -2}, {x: 0, y: -2}, {x: 1, y: -2}, {x: -2, y: -1},
+     {x: -1, y: -1}, {x: 0, y: -1}, {x: 1, y: -1}, {x: -2, y: 0},
+     {x: -1, y: 0}],
     [{x: -3, y: -1}, {x: -2, y: -1}, {x: -1, y: -1}, {x: 0, y: -1},
      {x: 1, y: -1}, {x: -4, y: 0}, {x: -3, y: 0}, {x: -2, y: 0}, {x: -1, y: 0}]
   ];
@@ -772,8 +773,6 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
   function processSegment(segment, visitor) {
     var header = segment.header;
-    if (!(header.typeName in visitor))
-      return;
 
     var data = segment.data, position = segment.start, end = segment.end;
     var args;
@@ -910,13 +909,16 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
         args = [pageInfo];
         break;
+      case 50: // EndOfStripe
+        break;
       case 51: // EndOfFile
         break;
       default:
         throw 'Segment type is not implemented: ' +
               header.type + '/' + header.typeName;
     }
-    visitor[header.typeName].apply(visitor, args);
+    if (header.typeName in visitor)
+      visitor[header.typeName].apply(visitor, args);
   }
 
   function processSegments(segments, visitor) {

From 699abbd4f23748c2859f3db1b5bac401ccd25ad8 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 22 Jun 2012 05:36:56 -0500
Subject: [PATCH 08/27] Removing huffman tables; decoding context refactoring

---
 src/jbig2.js | 186 ++++++++++++++++++++++-----------------------------
 1 file changed, 81 insertions(+), 105 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index 40e286252..cdd2e35ab 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -168,14 +168,50 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     return ArithmeticDecoder;
   })();
 
+  // Utility data structures
+  function ContextCache() {}
+
+  ContextCache.prototype = {
+    getContexts: function(id) {
+      if (id in this)
+        return this[id];
+      return (this[id] = []);
+    }
+  };
+
+  function DecodingContext(data, start, end) {
+    this.data = data;
+    this.start = start;
+    this.end = end;
+  }
+
+  DecodingContext.prototype = {
+    get decoder() {
+      var decoder = new ArithmeticDecoder(this.data, this.start, this.end);
+      Object.defineProperty(this, 'decoder', {
+        value: decoder,
+        writable: false,
+        configurable: true,
+        enumerable: true
+      });
+      return decoder;
+    },
+    get contextCache() {
+      var cache = new ContextCache();
+      Object.defineProperty(this, 'contextCache', {
+        value: cache,
+        writable: false,
+        configurable: true,
+        enumerable: true
+      });
+      return cache;
+    }
+  };
+
   // Annex A. Arithmetic Integer Decoding Procedure
   // A.2 Procedure for decoding values
   function decodeInteger(contextCache, procedure, decoder) {
-    var contexts;
-    if (procedure in contextCache)
-      contexts = contextCache[procedure];
-    else
-      contextCache[procedure] = contexts = [];
+    var contexts = contextCache.getContexts(procedure);
 
     var prev = 1;
     var state = 1, v = 0, s;
@@ -232,13 +268,10 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     v += offset;
     return !s ? v : v > 0 ? -v : null;
   }
+
   // A.3 The IAID decoding procedure
   function decodeIAID(contextCache, decoder, codeLength) {
-    var contexts;
-    if ('IAID' in contextCache)
-      contexts = contextCache['IAID'];
-    else
-      contextCache['IAID'] = contexts = [];
+    var contexts = contextCache.getContexts('IAID');
 
     var prev = 1;
     for (var i = 0; i < codeLength; i++) {
@@ -254,41 +287,6 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       return prev - Math.pow(2, codeLength);
   }
 
-  // Annex B. Huffman Table Decoding Procedure
-  // B.5 Standard Huffman tables
-  function TableB1(reader) {
-    if (!reader.readBit())
-      return reader.readBits(4); // 0 + VAL
-    if (!reader.readBit())
-      return reader.readBits(8) + 16; // 10 + (VAL - 16)
-    if (!reader.readBit())
-      return reader.readBits(16) + 272; // 110 + (VAL - 272)
-    if (!reader.readBit())
-      return reader.readBits(32) + 65808; // 1110 + (VAL - 65808)
-  }
-
-  function TableB2(reader) {
-    if (!reader.readBit())
-      return 0; // 0
-    if (!reader.readBit())
-      return 1; // 10
-    if (!reader.readBit())
-      return 2; // 110
-    if (!reader.readBit())
-      return reader.readBits(3) + 3; // 1110 + (VAL - 3)
-    if (!reader.readBit())
-      return reader.readBits(6) + 11; // 11110 + (VAL - 11)
-    if (!reader.readBit())
-      return reader.readBits(32) + 75; // 111110 + (VAL - 75)
-    return null; // OOB
-  }
-
-  function TableB3(reader) {}
-
-  function TableB4(reader) {}
-
-  function TableB5(reader) {}
-
   // 7.3 Segment types
   var SegmentTypes = [
     'SymbolDictionary', null, null, null, 'IntermediateTextRegion', null,
@@ -374,7 +372,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
   // 6.2 Generic Region Decoding Procedure
   function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
-                        data, start, end) {
+                        decodingContext) {
     if (mmr)
       throw 'MMR encoding is not supported';
 
@@ -390,23 +388,14 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
     var pseudoPixelContext = ReusedContexts[templateIndex];
     var bitmap = [];
-    var decoder, contexts, cx;
-    if (data instanceof ArithmeticDecoder) {
-      decoder = data;
-      var contextCache = start;
-      if ('GB' in contextCache)
-        contexts = contextCache['GB'];
-      else
-        contextCache['GB'] = contexts = [];
-    } else {
-      decoder = new ArithmeticDecoder(data, start, end);
-      contexts = [];
-    }
+
+    var decoder = decodingContext.decoder;
+    var contexts = decodingContext.contextCache.getContexts('GB');
 
     var ltp = 0;
     for (var i = 0; i < height; i++) {
       if (prediction) {
-        cx = contexts[pseudoPixelContext];
+        var cx = contexts[pseudoPixelContext];
         if (!cx)
           contexts[pseudoPixelContext] = cx = {index: 0, mps: 0};
         var sltp = decoder.readBit(cx);
@@ -431,7 +420,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           else
             contextLabel = (contextLabel << 1) | bitmap[i0][j0];
         }
-        cx = contexts[contextLabel];
+        var cx = contexts[contextLabel];
         if (!cx)
           contexts[contextLabel] = cx = {index: 0, mps: 0};
         var pixel = decoder.readBit(cx);
@@ -444,7 +433,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
   // 6.3.2 Generic Refinement Region Decoding Procedure
   function decodeRefinement(width, height, templateIndex, referenceBitmap,
                             offsetX, offsetY, prediction, at,
-                            data, start, end) {
+                            decodingContext) {
     var codingTemplate = RefinementTemplates[templateIndex].coding;
     if (templateIndex == 0)
       codingTemplate = codingTemplate.concat([at[0]]);
@@ -470,23 +459,14 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
     var pseudoPixelContext = RefinementReusedContexts[templateIndex];
     var bitmap = [];
-    var decoder, contexts, cx;
-    if (data instanceof ArithmeticDecoder) {
-      decoder = data;
-      var contextCache = start;
-      if ('GR' in contextCache)
-        contexts = contextCache['GR'];
-      else
-        contextCache['GR'] = contexts = [];
-    } else {
-      decoder = new ArithmeticDecoder(data, start, end);
-      contexts = [];
-    }
+
+    var decoder = decodingContext.decoder;
+    var contexts = decodingContext.contextCache.getContexts('GR');
 
     var ltp = 0;
     for (var i = 0; i < height; i++) {
       if (prediction) {
-        cx = contexts[pseudoPixelContext];
+        var cx = contexts[pseudoPixelContext];
         if (!cx)
           contexts[pseudoPixelContext] = cx = {index: 0, mps: 0};
         var sltp = decoder.readBit(cx);
@@ -514,7 +494,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           else
             contextLabel = (contextLabel << 1) | referenceBitmap[i0][j0];
         }
-        cx = contexts[contextLabel];
+        var cx = contexts[contextLabel];
         if (!cx)
           contexts[contextLabel] = cx = {index: 0, mps: 0};
         var pixel = decoder.readBit(cx);
@@ -530,15 +510,17 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                   numberOfNewSymbols, numberOfExportedSymbols,
                                   huffmanTables, templateIndex, at,
                                   refinementTemplateIndex, refinementAt,
-                                  data, start, end) {
+                                  decodingContext) {
     if (huffman)
       throw 'huffman is not supported';
 
     var newSymbols = [];
     var currentHeight = 0;
-    var contextCache = {};
     var symbolCodeLength = log2(symbols.length + numberOfNewSymbols);
-    var decoder = new ArithmeticDecoder(data, start, end);
+
+    var decoder = decodingContext.decoder;
+    var contextCache = decodingContext.contextCache;
+
     while (newSymbols.length < numberOfNewSymbols) {
       var deltaHeight = decodeInteger(contextCache, 'IADH', decoder); // 6.5.6
       currentHeight += deltaHeight;
@@ -563,11 +545,11 @@ var Jbig2Image = (function Jbig2ImageClosure() {
             newSymbols[symbolId - symbols.length];
           bitmap = decodeRefinement(currentWidth, currentHeight,
             refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt,
-            decoder, contextCache);
+            decodingContext);
         } else {
           // 6.5.8.1 Direct-coded symbol bitmap
           bitmap = decodeBitmap(false, currentWidth, currentHeight,
-            templateIndex, false, null, at, decoder, contextCache);
+            templateIndex, false, null, at, decodingContext);
         }
         newSymbols.push(bitmap);
       }
@@ -594,7 +576,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                             transposed, dsOffset, referenceCorner,
                             combinationOperator, huffmanTables,
                             refinementTemplateIndex, refinementAt,
-                            data, start, end) {
+                            decodingContext) {
     if (huffman)
       throw 'huffman is not supported';
 
@@ -609,8 +591,8 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       bitmap.push(row);
     }
 
-    var contextCache = {};
-    var decoder = new ArithmeticDecoder(data, start, end);
+    var decoder = decodingContext.decoder;
+    var contextCache = decodingContext.contextCache;
 
     if (transposed)
       throw 'transposed!=0 is not supported';
@@ -647,7 +629,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           symbolBitmap = decodeRefinement(symbolWidth, symbolHeight,
             refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx,
             (rdh >> 1) + rdy, false, refinementAt,
-            decoder, contextCache);
+            decodingContext);
         }
         var offsetT = t - ((referenceCorner & 1) ? 0 : symbolHeight);
         var offsetS = currentS - ((referenceCorner & 2) ? symbolWidth : 0);
@@ -1007,64 +989,58 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       function SimpleSegmentVisitor_ImmediateGenericRegion(region, data,
                                                            start, end) {
       var regionInfo = region.info;
+      var decodingContext = new DecodingContext(data, start, end);
       var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
                                 region.template, region.prediction, null,
-                                region.at, data, start, end);
+                                region.at, decodingContext);
       this.drawBitmap(regionInfo, bitmap);
     },
     SymbolDictionary:
       function SimpleSegmentVisitor_SymbolDictionary(dictionary, currentSegment,
                                                      referredSegments,
                                                      data, start, end) {
-      var symbols = this.symbols;
       var huffmanTables;
-      if (dictionary.huffman) {
-        huffmanTables = {};
-        huffmanTables.DeltaHeights = dictionary.huffmanDHSelector == 0 ?
-          TableB4 : dictionary.huffmanDHSelector == 1 ? TableB5 :
-          this.userTable;
-        huffmanTables.DeltaWidths = dictionary.huffmanDHSelector == 0 ?
-          TableB2 : dictionary.huffmanDHSelector == 2 ? TableB3 :
-          this.userTable;
-        huffmanTables.BitmapSize = dictionary.huffmanBitmapSizeSelector == 0 ?
-          TableB1 : this.userTable;
-        huffmanTables.AggregationInstances =
-          dictionary.aggregationInstancesSelector == 0 ? TableB1 :
-          this.userTable;
-      }
+      if (dictionary.huffman)
+        throw 'huffman is not supported';
+
       // Combines exported symbols from all referred segments
+      var symbols = this.symbols;
+      if (!symbols)
+        this.symbols = symbols = {};
+
       var inputSymbols = [];
       for (var i = 0; i < referredSegments.length; i++)
         inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
 
-      if (!symbols)
-        this.symbols = symbols = {};
+      var decodingContext = new DecodingContext(data, start, end);
       symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman,
         dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols,
         dictionary.numberOfExportedSymbols, huffmanTables,
         dictionary.template, dictionary.at,
         dictionary.refinementTemplate, dictionary.refinementAt,
-        data, start, end);
+        decodingContext);
     },
     ImmediateTextRegion:
       function SimpleSegmentVisitor_ImmediateTextRegion(region,
                                                         referredSegments,
                                                         data, start, end) {
       var regionInfo = region.info;
-      var symbols = this.symbols;
       var huffmanTables;
+
       // Combines exported symbols from all referred segments
+      var symbols = this.symbols;
       var inputSymbols = [];
       for (var i = 0; i < referredSegments.length; i++)
         inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
       var symbolCodeLength = log2(inputSymbols.length);
 
+      var decodingContext = new DecodingContext(data, start, end);
       var bitmap = decodeTextRegion(region.huffman, region.refinement,
         regionInfo.width, regionInfo.height, region.defaultPixelValue,
         region.numberOfSymbolInstances, region.stripSize, inputSymbols,
         symbolCodeLength, region.transposed, region.dsOffset,
         region.referenceCorner, region.combinationOperator, huffmanTables,
-        region.refinementTemplate, region.refinementAt, data, start, end);
+        region.refinementTemplate, region.refinementAt, decodingContext);
       this.drawBitmap(regionInfo, bitmap);
     }
   };

From f01448114975a0ceb25c8423ab8631079f26dc56 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 22 Jun 2012 05:55:19 -0500
Subject: [PATCH 09/27] Replaces throw to error() and uses shadow()

---
 src/jbig2.js | 57 ++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index cdd2e35ab..1bcb1e391 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -188,23 +188,11 @@ var Jbig2Image = (function Jbig2ImageClosure() {
   DecodingContext.prototype = {
     get decoder() {
       var decoder = new ArithmeticDecoder(this.data, this.start, this.end);
-      Object.defineProperty(this, 'decoder', {
-        value: decoder,
-        writable: false,
-        configurable: true,
-        enumerable: true
-      });
-      return decoder;
+      return shadow(this, 'decoder', decoder);
     },
     get contextCache() {
       var cache = new ContextCache();
-      Object.defineProperty(this, 'contextCache', {
-        value: cache,
-        writable: false,
-        configurable: true,
-        enumerable: true
-      });
-      return cache;
+      return shadow(this, 'contextCache', cache);
     }
   };
 
@@ -374,7 +362,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
   function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at,
                         decodingContext) {
     if (mmr)
-      throw 'MMR encoding is not supported';
+      error('JBIG2 error: MMR encoding is not supported');
 
     var useskip = !!skip;
     var template = CodingTemplates[templateIndex].concat(at);
@@ -476,7 +464,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       bitmap.push(row);
       for (var j = 0; j < width; j++) {
         if (ltp)
-          throw 'prediction is not supported';
+          error('JBIG2 error: prediction is not supported');
 
         var contextLabel = 0;
         for (var k = 0; k < codingTemplateLength; k++) {
@@ -512,7 +500,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                   refinementTemplateIndex, refinementAt,
                                   decodingContext) {
     if (huffman)
-      throw 'huffman is not supported';
+      error('JBIG2 error: huffman is not supported');
 
     var newSymbols = [];
     var currentHeight = 0;
@@ -537,7 +525,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
           // 6.5.8.2 Refinement/aggregate-coded symbol bitmap
           var numberOfInstances = decodeInteger(contextCache, 'IAAI', decoder);
           if (numberOfInstances > 1)
-            throw 'number of instances > 1 is not supported';
+            error('JBIG2 error: number of instances > 1 is not supported');
           var symbolId = decodeIAID(contextCache, decoder, symbolCodeLength);
           var rdx = decodeInteger(contextCache, 'IARDX', decoder); // 6.4.11.3
           var rdy = decodeInteger(contextCache, 'IARDY', decoder); // 6.4.11.4
@@ -578,7 +566,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                             refinementTemplateIndex, refinementAt,
                             decodingContext) {
     if (huffman)
-      throw 'huffman is not supported';
+      error('JBIG2 error: huffman is not supported');
 
     // Prepare bitmap
     var bitmap = [];
@@ -595,9 +583,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     var contextCache = decodingContext.contextCache;
 
     if (transposed)
-      throw 'transposed!=0 is not supported';
-    if (combinationOperator != 0 && combinationOperator != 2)
-      throw 'combinationOperator==' + combinationOperator + ' is not supported';
+      error('JBIG2 error: transposed is not supported');
 
     var stripT = -decodeInteger(contextCache, 'IADT', decoder); // 6.4.6
     var firstS = 0;
@@ -646,6 +632,9 @@ var Jbig2Image = (function Jbig2ImageClosure() {
               for (var s2 = 0; s2 < symbolWidth; s2++)
                 row[offsetS + s2] ^= symbolRow[s2];
               break;
+            default:
+              error('JBIG2 error: operator ' + combinationOperator +
+                    ' is not supported');
           }
         }
 
@@ -667,7 +656,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     var flags = data[start + 4];
     var segmentType = flags & 0x3F;
     if (!SegmentTypes[segmentType])
-      throw 'Invalid segment type: ' + segmentType;
+      error('JBIG2 error: invalid segment type: ' + segmentType);
     segmentHeader.type = segmentType;
     segmentHeader.typeName = SegmentTypes[segmentType];
     segmentHeader.deferredNonRetain = !!(flags & 0x80);
@@ -685,7 +674,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         retainBits.push(data[position++]);
       }
     } else if (referredFlags == 5 || referredFlags == 6)
-      throw 'Invalid referred-to flags';
+      error('JBIG2 error: invalid referred-to flags');
     segmentHeader.retainBits = retainBits;
     var referredToSegmentNumberSize = segmentHeader.number <= 256 ? 1 :
       segmentHeader.number <= 65536 ? 2 : 4;
@@ -706,7 +695,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     }
     segmentHeader.length = readUint32(data, position);
     if (segmentHeader.length == 0xFFFFFFFF)
-      throw 'Unsupported unknown segment length';
+      error('JBIG2 error: unknown segment length is not supported');
     position += 4;
     segmentHeader.headerEnd = position;
     return segmentHeader;
@@ -847,7 +836,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         position += 4;
         // TODO 7.4.3.1.7 Symbol ID Huffman table decoding
         if (textRegion.huffman)
-          throw 'huffman is not supported';
+          error('JBIG2 error: huffman is not supported');
         args = [textRegion, header.referredTo, data, position, end];
         break;
       case 38: // ImmediateGenericRegion
@@ -896,8 +885,8 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       case 51: // EndOfFile
         break;
       default:
-        throw 'Segment type is not implemented: ' +
-              header.type + '/' + header.typeName;
+        error('JBIG2 error: segment type ' + header.typeName + '(' +
+              header.type + ') is not implemented');
     }
     if (header.typeName in visitor)
       visitor[header.typeName].apply(visitor, args);
@@ -914,7 +903,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         data[position + 2] != 0x42 || data[position + 3] != 0x32 ||
         data[position + 4] != 0x0D || data[position + 5] != 0x0A ||
         data[position + 6] != 0x1A || data[position + 7] != 0x0A)
-      throw 'JBIG2 invalid header';
+      error('JBIG2 error: invalid header');
     var header = {};
     position += 8;
     var flags = data[position++];
@@ -924,6 +913,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       position += 4;
     }
     var segments = readSegments(header, data, position, end);
+    error('Not implemented');
     // processSegments(segments, new SimpleSegmentVisitor());
   }
 
@@ -953,13 +943,13 @@ var Jbig2Image = (function Jbig2ImageClosure() {
       var pageInfo = this.currentPageInfo;
       var width = regionInfo.width, height = regionInfo.height;
       var rowSize = (pageInfo.width + 7) >> 3;
-      var operator = pageInfo.combinationOperatorOverride ?
+      var combinationOperator = pageInfo.combinationOperatorOverride ?
         regionInfo.combinationOperator : pageInfo.combinationOperator;
       var buffer = this.buffer;
       for (var i = 0; i < height; i++) {
         var mask = 128 >> (regionInfo.x & 7);
         var offset = (i + regionInfo.y) * rowSize + (regionInfo.x >> 3);
-        switch (operator) {
+        switch (combinationOperator) {
           case 0: // OR
             for (var j = 0; j < width; j++) {
               buffer[offset] |= bitmap[i][j] ? mask : 0;
@@ -981,7 +971,8 @@ var Jbig2Image = (function Jbig2ImageClosure() {
             }
             break;
           default:
-            throw 'Unimplemented operator: ' + operator;
+            error('JBIG2 error: operator ' + combinationOperator +
+                  ' is not supported');
         }
       }
     },
@@ -1001,7 +992,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                                      data, start, end) {
       var huffmanTables;
       if (dictionary.huffman)
-        throw 'huffman is not supported';
+        error('JBIG2 error: huffman is not supported');
 
       // Combines exported symbols from all referred segments
       var symbols = this.symbols;

From ae56ed53a2e67b86dc438a597efd4e1397fa49d1 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 22 Jun 2012 05:59:53 -0500
Subject: [PATCH 10/27] jbig2 ref test

---
 test/pdfs/issue1810.pdf.link | 1 +
 test/test_manifest.json      | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 test/pdfs/issue1810.pdf.link

diff --git a/test/pdfs/issue1810.pdf.link b/test/pdfs/issue1810.pdf.link
new file mode 100644
index 000000000..b8689c298
--- /dev/null
+++ b/test/pdfs/issue1810.pdf.link
@@ -0,0 +1 @@
+http://www.freepatentsonline.com/pdf/documents/uspt/D661/USD661296/USD661296S1.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 25d2a2080..cee12fbb1 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -589,6 +589,14 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue1810",
+      "file": "pdfs/issue1810.pdf",
+      "md5": "b173a9dfb7bf00e1a298c6e8cb95c03e",
+      "rounds": 1,
+      "pageLimit": 3,
+      "link": true,
+      "type": "eq"
+    },
     {  "id": "issue1597",
       "file": "pdfs/issue1597.pdf",
       "md5": "a5ebef467fd6e2fc0aeb56c9eb725ae3",

From 306092f53ea25d7cbf155e91c13e8ffc34bfb099 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 22 Jun 2012 06:41:28 -0500
Subject: [PATCH 11/27] Add jbig2 references to examples and make.js

---
 examples/acroforms/index.html  | 1 +
 examples/helloworld/index.html | 1 +
 make.js                        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html
index 858ad649f..193d16ee6 100644
--- a/examples/acroforms/index.html
+++ b/examples/acroforms/index.html
@@ -25,6 +25,7 @@
   <script type="text/javascript" src="../../src/worker.js"></script>
   <script type="text/javascript" src="../../external/jpgjs/jpg.js"></script>
   <script type="text/javascript" src="../../src/jpx.js"></script>
+  <script type="text/javascript" src="../../src/jbig2.js"></script>
 
   <script type="text/javascript">
     // Specify the main script used to create a new PDF.JS web worker.
diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
index c9df98809..ec386dbbe 100644
--- a/examples/helloworld/index.html
+++ b/examples/helloworld/index.html
@@ -25,6 +25,7 @@
   <script type="text/javascript" src="../../src/worker.js"></script>
   <script type="text/javascript" src="../../external/jpgjs/jpg.js"></script>
   <script type="text/javascript" src="../../src/jpx.js"></script>
+  <script type="text/javascript" src="../../src/jbig2.js"></script>
 
   <script type="text/javascript">
     // Specify the main script used to create a new PDF.JS web worker.
diff --git a/make.js b/make.js
index 62881ae19..727e740ca 100755
--- a/make.js
+++ b/make.js
@@ -166,6 +166,7 @@ target.bundle = function() {
         'worker.js',
         '../external/jpgjs/jpg.js',
         'jpx.js',
+        'jbig2.js',
         'bidi.js',
         'metadata.js'];
 

From e7ee11c86a8aa432c44c4d1de8bc7a8556987ac6 Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Mon, 25 Jun 2012 14:24:58 +0200
Subject: [PATCH 12/27] Dutch localization for pdf.js

---
 l10n/nl/chrome.properties |  3 ++
 l10n/nl/metadata.inc      |  8 ++++
 l10n/nl/viewer.properties | 89 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 l10n/nl/chrome.properties
 create mode 100644 l10n/nl/metadata.inc
 create mode 100644 l10n/nl/viewer.properties

diff --git a/l10n/nl/chrome.properties b/l10n/nl/chrome.properties
new file mode 100644
index 000000000..800cc3815
--- /dev/null
+++ b/l10n/nl/chrome.properties
@@ -0,0 +1,3 @@
+# Chrome notification bar messages and buttons
+unsupported_feature=Dit PDF document wordt misschien niet goed getoond.
+open_with_different_viewer=Bekijk in ander programma
diff --git a/l10n/nl/metadata.inc b/l10n/nl/metadata.inc
new file mode 100644
index 000000000..87e10b713
--- /dev/null
+++ b/l10n/nl/metadata.inc
@@ -0,0 +1,8 @@
+    <em:localized>
+      <Description>
+        <em:locale>nl</em:locale>
+        <em:name>PDF Viewer</em:name>
+        <em:description>Gebruikt HTML5 om PDF bestanden direct in de browser te openen.</em:description>
+      </Description>
+    </em:localized>
+
diff --git a/l10n/nl/viewer.properties b/l10n/nl/viewer.properties
new file mode 100644
index 000000000..5164862ea
--- /dev/null
+++ b/l10n/nl/viewer.properties
@@ -0,0 +1,89 @@
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Vorige pagina
+previous_label=Vorige
+next.title=Volgende pagina
+next_label=Volgende
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Pagina:
+page_of=van {{pageCount}}
+
+zoom_out.title=Zoom uit
+zoom_out_label=Zoom uit
+zoom_in.title=Zoom in
+zoom_in_label=Zoom in
+zoom.title=Zoom
+print.title=Print
+print_label=Print
+open_file.title=Open bestand
+open_file_label=Open
+download.title=Download
+download_label=Download
+bookmark.title=Huidige beeld (kopieer of open in nieuw venster)
+bookmark_label=Huidige beeld
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Zijbalk tonen
+toggle_slider_label=Zijbalk tonen
+outline.title=Toon document structuur
+outline_label=Document structuur
+thumbs.title=Toon miniaturen
+thumbs_label=Miniaturen
+search_panel.title=Doorzoek document
+search_panel_label=Zoek
+
+# Document outline messages
+no_outline=Geen structuur beschikbaar
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Pagina {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatuur van pagina {{page}}
+
+# Search panel button title and messages
+search=Zoek
+search_terms_not_found=(Niet gevonden)
+
+# Error panel labels
+error_more_info=Meer informatie
+error_less_info=Minder informatie
+error_close=Sluiten
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=PDF.JS Build: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Bericht: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stapel: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Bestand: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Regel: {{line}}
+rendering_error=Er heeft zich een probleem voorgedaan bij het optekenen van de pagina.
+
+# Predefined zoom values
+page_scale_width=Paginabreedte
+page_scale_fit=Pagina passend
+page_scale_auto=Automatische Zoom
+page_scale_actual=Werkelijke grootte
+
+# Loading indicator messages
+loading_error_indicator=Fout
+loading_error=Er heeft zich een fout voorgedaan bij het laden van de PDF.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[{{type}} Annotation]
+request_password=PDF is beveiligd door een wachtwoord:

From 25d4467fa35b123072291f4de091cb98f40c7ccd Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Tue, 26 Jun 2012 00:32:59 -0500
Subject: [PATCH 13/27] Fixes .length and capitalization nits

---
 src/jbig2.js | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index 1bcb1e391..239b9fefb 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -545,13 +545,14 @@ var Jbig2Image = (function Jbig2ImageClosure() {
     // 6.5.10 Exported symbols
     var exportedSymbols = [];
     var flags = [], currentFlag = false;
-    while (flags.length < symbols.length + numberOfNewSymbols) {
+    var totalSymbolsLength = symbols.length + numberOfNewSymbols;
+    while (flags.length < totalSymbolsLength) {
       var runLength = decodeInteger(contextCache, 'IAEX', decoder);
       while (runLength--)
         flags.push(currentFlag);
       currentFlag = !currentFlag;
     }
-    for (var i = 0; i < symbols.length; i++)
+    for (var i = 0, ii = symbols.length; i < ii; i++)
       if (flags[i]) exportedSymbols.push(symbols[i]);
     for (var j = 0; j < numberOfNewSymbols; i++, j++)
       if (flags[i]) exportedSymbols.push(newSymbols[j]);
@@ -721,7 +722,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         break; // end of file is found
     }
     if (header.randomAccess) {
-      for (var i = 0; i < segments.length; i++) {
+      for (var i = 0, ii = segments.length; i < ii; i++) {
         segments[i].start = position;
         position += segments[i].header.length;
         segments[i].end = position;
@@ -888,12 +889,13 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         error('JBIG2 error: segment type ' + header.typeName + '(' +
               header.type + ') is not implemented');
     }
-    if (header.typeName in visitor)
-      visitor[header.typeName].apply(visitor, args);
+    var callbackName = 'on' + header.typeName;
+    if (callbackName in visitor)
+      visitor[callbackName].apply(visitor, args);
   }
 
   function processSegments(segments, visitor) {
-    for (var i = 0; i < segments.length; i++)
+    for (var i = 0, ii = segments.length; i < ii; i++)
       processSegment(segments[i], visitor);
   }
 
@@ -919,7 +921,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
 
   function parseJbig2Chunks(chunks) {
     var visitor = new SimpleSegmentVisitor();
-    for (var i = 0; i < chunks.length; i++) {
+    for (var i = 0, ii = chunks.length; i < ii; i++) {
       var chunk = chunks[i];
       var segments = readSegments({}, chunk.data, chunk.start, chunk.end);
       processSegments(segments, visitor);
@@ -930,12 +932,12 @@ var Jbig2Image = (function Jbig2ImageClosure() {
   function SimpleSegmentVisitor() {}
 
   SimpleSegmentVisitor.prototype = {
-    PageInformation: function SimpleSegmentVisitor_PageInformation(info) {
+    onPageInformation: function SimpleSegmentVisitor_onPageInformation(info) {
       this.currentPageInfo = info;
       var rowSize = (info.width + 7) >> 3;
       var buffer = new Uint8Array(rowSize * info.height);
       var fill = info.defaultPixelValue ? 0xFF : 0;
-      for (var i = 0; i < buffer.length; i++)
+      for (var i = 0, ii = buffer.length; i < ii; i++)
         buffer[i] = fill;
       this.buffer = buffer;
     },
@@ -976,9 +978,9 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         }
       }
     },
-    ImmediateGenericRegion:
-      function SimpleSegmentVisitor_ImmediateGenericRegion(region, data,
-                                                           start, end) {
+    onImmediateGenericRegion:
+      function SimpleSegmentVisitor_onImmediateGenericRegion(region, data,
+                                                             start, end) {
       var regionInfo = region.info;
       var decodingContext = new DecodingContext(data, start, end);
       var bitmap = decodeBitmap(region.mmr, regionInfo.width, regionInfo.height,
@@ -986,10 +988,11 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                 region.at, decodingContext);
       this.drawBitmap(regionInfo, bitmap);
     },
-    SymbolDictionary:
-      function SimpleSegmentVisitor_SymbolDictionary(dictionary, currentSegment,
-                                                     referredSegments,
-                                                     data, start, end) {
+    onSymbolDictionary:
+      function SimpleSegmentVisitor_onSymbolDictionary(dictionary,
+                                                       currentSegment,
+                                                       referredSegments,
+                                                       data, start, end) {
       var huffmanTables;
       if (dictionary.huffman)
         error('JBIG2 error: huffman is not supported');
@@ -1000,7 +1003,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         this.symbols = symbols = {};
 
       var inputSymbols = [];
-      for (var i = 0; i < referredSegments.length; i++)
+      for (var i = 0, ii = referredSegments.length; i < ii; i++)
         inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
 
       var decodingContext = new DecodingContext(data, start, end);
@@ -1011,17 +1014,17 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         dictionary.refinementTemplate, dictionary.refinementAt,
         decodingContext);
     },
-    ImmediateTextRegion:
-      function SimpleSegmentVisitor_ImmediateTextRegion(region,
-                                                        referredSegments,
-                                                        data, start, end) {
+    onImmediateTextRegion:
+      function SimpleSegmentVisitor_onImmediateTextRegion(region,
+                                                          referredSegments,
+                                                          data, start, end) {
       var regionInfo = region.info;
       var huffmanTables;
 
       // Combines exported symbols from all referred segments
       var symbols = this.symbols;
       var inputSymbols = [];
-      for (var i = 0; i < referredSegments.length; i++)
+      for (var i = 0, ii = referredSegments.length; i < ii; i++)
         inputSymbols = inputSymbols.concat(symbols[referredSegments[i]]);
       var symbolCodeLength = log2(inputSymbols.length);
 

From c131715a2fb7253a50baffb514efa6ed9af01751 Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Tue, 26 Jun 2012 10:12:10 +0200
Subject: [PATCH 14/27] Make web workers debuggable! This way an error can be
 caught in the browser when the web worker throws an error. See
 http://www.nczonline.net/blog/2009/08/25/web-workers-errors-and-debugging/

---
 src/worker.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/worker.js b/src/worker.js
index c1dfa79af..161814f69 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -20,6 +20,10 @@ function MessageHandler(name, comObj) {
     warn(data);
   }];
 
+  comObj.onerror = function(event){
+    throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
+  };
+
   comObj.onmessage = function messageHandlerComObjOnMessage(event) {
     var data = event.data;
     if (data.isReply) {

From 709181899ed6a00090876ced4434cef2b65720d8 Mon Sep 17 00:00:00 2001
From: Peter Lofgren <peter@loftux.se>
Date: Tue, 26 Jun 2012 19:36:05 +0200
Subject: [PATCH 15/27] Updated Swedish locale

---
 l10n/sv/chrome.properties |   3 ++
 l10n/sv/viewer.properties | 102 +++++++++++++++++++++++++++-----------
 2 files changed, 76 insertions(+), 29 deletions(-)
 create mode 100644 l10n/sv/chrome.properties

diff --git a/l10n/sv/chrome.properties b/l10n/sv/chrome.properties
new file mode 100644
index 000000000..3c0e4b805
--- /dev/null
+++ b/l10n/sv/chrome.properties
@@ -0,0 +1,3 @@
+# Chrome notification bar messages and buttons
+unsupported_feature=Denna PDF kanske inte visas korrekt.
+open_with_different_viewer=Öppna med annan pdf-visare.
diff --git a/l10n/sv/viewer.properties b/l10n/sv/viewer.properties
index 3aadfd44f..81d4a3958 100644
--- a/l10n/sv/viewer.properties
+++ b/l10n/sv/viewer.properties
@@ -1,45 +1,89 @@
-bookmark.title=Aktuell vy (visa eller öppna i nytt fönster)
+# Main toolbar buttons (tooltips and alt text for images)
 previous.title=Föregående sida
+previous_label=Föregående
 next.title=Nästa sida
-print.title=Skriv ut
-download.title=Ladda ner
+next_label=Nästa
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Sida:
+page_of=av {{pageCount}}
+
 zoom_out.title=Zooma ut
+zoom_out_label=Zooma ut
 zoom_in.title=Zooma in
+zoom_in_label=Zooma in
+zoom.title=Zooma
+print.title=Skriv ut
+print_label=Skriv ut
+open_file.title=Öppna fil
+open_file_label=Öppna
+download.title=Ladda ner
+download_label=Ladda ner
+bookmark.title=Aktuell vy (kopiera eller öppna i nytt fönster)
+bookmark_label=Aktuell vy
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Visa/Dölj panel
+toggle_slider_label=Visa/Dölj panel
+outline.title=Visa dokumentdisposition
+outline_label=Dokumentdisposition
+thumbs.title=Visa miniatyrer
+thumbs_label=Miniatyrer
+search_panel.title=Sök i dokumentet
+search_panel_label=Sök
+
+# Document outline messages
+no_outline=Ingen dokumentdisposition tillgänglig
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Sida {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatyr av sida {{page}}
+
+# Search panel button title and messages
+search=Hitta
+search_terms_not_found=(hittades inte)
+
+# Error panel labels
 error_more_info=Mer information
 error_less_info=Mindre information
 error_close=Stäng
-error_build=PDF.JS bygge: {{build}}
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=PDF.JS Bygge: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
 error_message=Meddelande: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
 error_stack=Stack: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
 error_file=Fil: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Rad: {{line}}
+rendering_error=Ett fel inträffade när sidan renderades.
+
+# Predefined zoom values
 page_scale_width=Sidbredd
 page_scale_fit=Passa sida
-page_scale_auto=Automatisk zoom
+page_scale_auto=Automatisk Zoom
 page_scale_actual=Faktisk storlek
-toggle_slider.title=Visa/Dölj panel
-thumbs.title=Visa miniatyrer
-outline.title=Visa dokumentdisposition
-loading=Laddar... {{percent}}%
+
+# Loading indicator messages
 loading_error_indicator=Fel
-loading_error=Ett fel inträffade när PDF dokumentet laddades.
-rendering_error=Ett fel inträffade när PDF dokumentet renderades.
-page_label=Sida:
-page_of=av {{pageCount}}
-no_outline=Ingen dokumentdisposition tillgänglig
-open_file.title=Öppna fil
+loading_error=Ett fel inträffade när PDFen skulle laddas.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotering]
-toggle_slider_label=Visa/Dölj panel
-thumbs_label=Miniatyrer
-outline_label=Disposition
-bookmark_label=Aktuell vy
-previous_label=Föregående
-next_label=Nästa
-print_label=Skriv ut
-download_label=Ladda ner
-zoom_out_label=Zooma ut
-zoom_in_label=Zooma in
-zoom.title=Zooma
-thumb_page_title=Sida {{page}}
-thumb_page_canvas=Miniatyr av sida {{page}}
-request_password=PDF dokumentet är skyddat av ett lösenord:
\ No newline at end of file
+request_password=PDFen är skyddad av lösenord:

From 0c33615301e6ccb024e897c9a08e4015a6f61ed6 Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@king-management.nl>
Date: Tue, 26 Jun 2012 23:07:37 +0200
Subject: [PATCH 16/27] Fixing web worker feature detection for Safari

---
 src/api.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/api.js b/src/api.js
index 7d65f96b4..88cc6e288 100644
--- a/src/api.js
+++ b/src/api.js
@@ -18,7 +18,7 @@
  * @return {Promise} A promise that is resolved with {PDFDocumentProxy} object.
  */
 PDFJS.getDocument = function getDocument(source) {
-  var url, data, headers, password, parameters = {};
+  var url, data, headers, password, parameters = {}, workerInitializedPromise, workerReadyPromise, transport;
   if (typeof source === 'string') {
     url = source;
   } else if (isArrayBuffer(source)) {
@@ -37,8 +37,9 @@ PDFJS.getDocument = function getDocument(source) {
           'string or a parameter object');
   }
 
-  var promise = new PDFJS.Promise();
-  var transport = new WorkerTransport(promise);
+  workerInitializedPromise = new PDFJS.Promise();
+  workerReadyPromise = new PDFJS.Promise();
+  transport = new WorkerTransport(workerInitializedPromise, workerReadyPromise);
   if (data) {
     // assuming the data is array, instantiating directly from it
     transport.sendData(data, parameters);
@@ -49,23 +50,26 @@ PDFJS.getDocument = function getDocument(source) {
         url: url,
         progress: function getPDFProgress(evt) {
           if (evt.lengthComputable)
-            promise.progress({
+			  workerReadyPromise.progress({
               loaded: evt.loaded,
               total: evt.total
             });
         },
         error: function getPDFError(e) {
-          promise.reject('Unexpected server response of ' +
+			workerReadyPromise.reject('Unexpected server response of ' +
             e.target.status + '.');
         },
         headers: headers
       },
       function getPDFLoad(data) {
-        transport.sendData(data, parameters);
+		//we have to wait for the WorkerTransport to finalize worker-support detection! This may take a while...
+		workerInitializedPromise.then(function () {
+        	transport.sendData(data, parameters);
+		});
       });
   }
 
-  return promise;
+  return workerReadyPromise;
 };
 
 /**
@@ -414,8 +418,8 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
  * For internal use only.
  */
 var WorkerTransport = (function WorkerTransportClosure() {
-  function WorkerTransport(promise) {
-    this.workerReadyPromise = promise;
+  function WorkerTransport(workerInitializedPromise, workerReadyPromise) {
+    this.workerReadyPromise = workerReadyPromise;
     this.objs = new PDFObjects();
 
     this.pageCache = [];
@@ -459,6 +463,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
             globalScope.PDFJS.disableWorker = true;
             this.setupFakeWorker();
           }
+          workerInitializedPromise.resolve();
         }.bind(this));
 
         var testObj = new Uint8Array(1);
@@ -474,6 +479,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
     // Thus, we fallback to a faked worker.
     globalScope.PDFJS.disableWorker = true;
     this.setupFakeWorker();
+	workerInitializedPromise.resolve();
   }
   WorkerTransport.prototype = {
     destroy: function WorkerTransport_destroy() {

From 823db83b1989a07ff3640b8d9c837dd08997132a Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Wed, 27 Jun 2012 11:05:17 +0200
Subject: [PATCH 17/27] Fixed Safari / Iphone / Ipad support further

---
 web/compatibility.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/compatibility.js b/web/compatibility.js
index 528841bb6..39580ef2a 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -6,6 +6,16 @@
 // Checking if the typed arrays are supported
 (function checkTypedArrayCompatibility() {
   if (typeof Uint8Array !== 'undefined') {
+    // some mobile versions do not support subarray (e.g. safari 5 / iPhone / iPad)
+    if (typeof Uint8Array.prototype.subarray === 'undefined') {
+        Uint8Array.prototype.subarray = function subarray(start, end) {
+          return new Uint8Array(this.slice(start, end));
+        }
+        Float32Array.prototype.subarray = function subarray(start, end) {
+            return new Float32Array(this.slice(start, end));
+        }
+    }
+
     // some mobile version might not support Float64Array
     if (typeof Float64Array === 'undefined')
       window.Float64Array = Float32Array;
@@ -69,7 +79,8 @@
 
 // Object.defineProperty() ?
 (function checkObjectDefinePropertyCompatibility() {
-  if (typeof Object.defineProperty !== 'undefined')
+  // safari 5 cannot use this on DOM objects and thus is unusable, see http://kangax.github.com/es5-compat-table/
+  if ((typeof Object.defineProperty !== 'undefined') && /Safari\/5/.test(navigator.userAgent))
     return;
 
   Object.defineProperty = function objectDefineProperty(obj, name, def) {

From 17c1018eefec2c00b01106b80bf3897b2a005634 Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Wed, 27 Jun 2012 11:14:14 +0200
Subject: [PATCH 18/27] lint compliance

---
 src/api.js           | 24 +++++++++++++++---------
 src/worker.js        |  4 ----
 web/compatibility.js |  9 +++++----
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/api.js b/src/api.js
index 88cc6e288..1d166f066 100644
--- a/src/api.js
+++ b/src/api.js
@@ -18,7 +18,9 @@
  * @return {Promise} A promise that is resolved with {PDFDocumentProxy} object.
  */
 PDFJS.getDocument = function getDocument(source) {
-  var url, data, headers, password, parameters = {}, workerInitializedPromise, workerReadyPromise, transport;
+  var url, data, headers, password, parameters = {}, workerInitializedPromise,
+    workerReadyPromise, transport;
+
   if (typeof source === 'string') {
     url = source;
   } else if (isArrayBuffer(source)) {
@@ -49,23 +51,27 @@ PDFJS.getDocument = function getDocument(source) {
       {
         url: url,
         progress: function getPDFProgress(evt) {
-          if (evt.lengthComputable)
-			  workerReadyPromise.progress({
+          if (evt.lengthComputable) {
+            workerReadyPromise.progress({
               loaded: evt.loaded,
               total: evt.total
             });
+          }
         },
         error: function getPDFError(e) {
-			workerReadyPromise.reject('Unexpected server response of ' +
+          workerReadyPromise.reject('Unexpected server response of ' +
             e.target.status + '.');
         },
         headers: headers
       },
       function getPDFLoad(data) {
-		//we have to wait for the WorkerTransport to finalize worker-support detection! This may take a while...
-		workerInitializedPromise.then(function () {
-        	transport.sendData(data, parameters);
-		});
+        // sometimes the pdf has finished downloading before the web worker-test
+        // has finished. In that case the rendering of the final pdf would cause
+        // errors. We have to wait for the WorkerTransport to finalize worker-
+        // support detection
+        workerInitializedPromise.then(function workerInitialized() {
+          transport.sendData(data, parameters);
+        });
       });
   }
 
@@ -479,7 +485,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
     // Thus, we fallback to a faked worker.
     globalScope.PDFJS.disableWorker = true;
     this.setupFakeWorker();
-	workerInitializedPromise.resolve();
+    workerInitializedPromise.resolve();
   }
   WorkerTransport.prototype = {
     destroy: function WorkerTransport_destroy() {
diff --git a/src/worker.js b/src/worker.js
index 161814f69..c1dfa79af 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -20,10 +20,6 @@ function MessageHandler(name, comObj) {
     warn(data);
   }];
 
-  comObj.onerror = function(event){
-    throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
-  };
-
   comObj.onmessage = function messageHandlerComObjOnMessage(event) {
     var data = event.data;
     if (data.isReply) {
diff --git a/web/compatibility.js b/web/compatibility.js
index 39580ef2a..ed4fae338 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -6,7 +6,7 @@
 // Checking if the typed arrays are supported
 (function checkTypedArrayCompatibility() {
   if (typeof Uint8Array !== 'undefined') {
-    // some mobile versions do not support subarray (e.g. safari 5 / iPhone / iPad)
+    // some mobile versions do not support subarray (e.g. safari 5 / iOS)
     if (typeof Uint8Array.prototype.subarray === 'undefined') {
         Uint8Array.prototype.subarray = function subarray(start, end) {
           return new Uint8Array(this.slice(start, end));
@@ -79,9 +79,10 @@
 
 // Object.defineProperty() ?
 (function checkObjectDefinePropertyCompatibility() {
-  // safari 5 cannot use this on DOM objects and thus is unusable, see http://kangax.github.com/es5-compat-table/
-  if ((typeof Object.defineProperty !== 'undefined') && /Safari\/5/.test(navigator.userAgent))
-    return;
+  // safari 5 cannot use this on DOM objects and thus is unusable,
+  // see http://kangax.github.com/es5-compat-table/
+  if ((typeof Object.defineProperty !== 'undefined') &&
+    /Safari\/5/.test(navigator.userAgent)) return;
 
   Object.defineProperty = function objectDefineProperty(obj, name, def) {
     delete obj[name];

From d70e6ab40c34d0ab737f11c65124a4d3b39df0df Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Wed, 27 Jun 2012 17:01:05 +0200
Subject: [PATCH 19/27] Bug, seen by  @yurydelendik, thanx!

---
 web/compatibility.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/compatibility.js b/web/compatibility.js
index ed4fae338..540dff0b1 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -79,10 +79,9 @@
 
 // Object.defineProperty() ?
 (function checkObjectDefinePropertyCompatibility() {
-  // safari 5 cannot use this on DOM objects and thus is unusable,
-  // see http://kangax.github.com/es5-compat-table/
+  // safari 5 and 6 cannot use this on DOM objects and thus it's unusable,
   if ((typeof Object.defineProperty !== 'undefined') &&
-    /Safari\/5/.test(navigator.userAgent)) return;
+    !/Safari/.test(navigator.userAgent)) return;
 
   Object.defineProperty = function objectDefineProperty(obj, name, def) {
     delete obj[name];

From 44d0802700b92d3623bfdd9976099a974d8050c8 Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Wed, 27 Jun 2012 18:30:43 +0200
Subject: [PATCH 20/27] We should use feature detection. Thanks @brendandahl

---
 web/compatibility.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/compatibility.js b/web/compatibility.js
index 540dff0b1..56a0ba43a 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -79,9 +79,16 @@
 
 // Object.defineProperty() ?
 (function checkObjectDefinePropertyCompatibility() {
-  // safari 5 and 6 cannot use this on DOM objects and thus it's unusable,
-  if ((typeof Object.defineProperty !== 'undefined') &&
-    !/Safari/.test(navigator.userAgent)) return;
+  if (typeof Object.defineProperty !== 'undefined') {
+    // Some browsers (e.g. safari) cannot use this on DOM objects
+    var definePropertyPossible = true;
+    try {
+      Object.defineProperty(new Image(), 'id', { value: 'test' });
+    } catch (e) {
+      definePropertyPossible = false;
+    }
+    if (definePropertyPossible) return true;
+  }
 
   Object.defineProperty = function objectDefineProperty(obj, name, def) {
     delete obj[name];

From a30199527e1f2c83ce7e81d7cb8b3d5612fc38ad Mon Sep 17 00:00:00 2001
From: Tim de Koning <github@kingsquare.nl>
Date: Wed, 27 Jun 2012 18:30:43 +0200
Subject: [PATCH 21/27] We should use feature detection. Thanks @brendandahl

---
 web/compatibility.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/web/compatibility.js b/web/compatibility.js
index 540dff0b1..825dce647 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -10,10 +10,10 @@
     if (typeof Uint8Array.prototype.subarray === 'undefined') {
         Uint8Array.prototype.subarray = function subarray(start, end) {
           return new Uint8Array(this.slice(start, end));
-        }
+        };
         Float32Array.prototype.subarray = function subarray(start, end) {
             return new Float32Array(this.slice(start, end));
-        }
+        };
     }
 
     // some mobile version might not support Float64Array
@@ -79,9 +79,17 @@
 
 // Object.defineProperty() ?
 (function checkObjectDefinePropertyCompatibility() {
-  // safari 5 and 6 cannot use this on DOM objects and thus it's unusable,
-  if ((typeof Object.defineProperty !== 'undefined') &&
-    !/Safari/.test(navigator.userAgent)) return;
+  if (typeof Object.defineProperty !== 'undefined') {
+    // some browsers (e.g. safari) cannot use defineProperty() on DOM objects
+    // and thus the native version is not sufficient
+    var definePropertyPossible = true;
+    try {
+      Object.defineProperty(new Image(), 'id', { value: 'test' });
+    } catch (e) {
+      definePropertyPossible = false;
+    }
+    if (definePropertyPossible) return;
+  }
 
   Object.defineProperty = function objectDefineProperty(obj, name, def) {
     delete obj[name];

From 07a24c55896f533fa85a297bf232b75ba7222e7a Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Thu, 28 Jun 2012 07:51:18 -0500
Subject: [PATCH 22/27] Warn instead of fail for CID fonts

---
 src/fonts.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index e340ab3d9..fd5c72dd2 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -4363,8 +4363,10 @@ var CFFParser = (function CFFParserClosure() {
 
       // DirectWrite does not like CID fonts data. Trying to convert/flatten
       // the font data and remove CID properties.
-      if (cff.fdArray.length !== 1)
-        error('Unable to normalize CID font in CFF data');
+      if (cff.fdArray.length !== 1) {
+        warn('Unable to normalize CID font in CFF data -- using font as is');
+        return cff;
+      }
 
       var fontDict = cff.fdArray[0];
       fontDict.setByKey(17, topDict.getByName('CharStrings'));

From f46b8b98bad3f133fc7fa0e3a86a3eeb2713a2f4 Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Wed, 4 Jul 2012 22:32:15 -0500
Subject: [PATCH 23/27] Add Spanish localization

---
 l10n/es/metadata.inc      |  8 ++++
 l10n/es/viewer.properties | 89 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 l10n/es/metadata.inc
 create mode 100644 l10n/es/viewer.properties

diff --git a/l10n/es/metadata.inc b/l10n/es/metadata.inc
new file mode 100644
index 000000000..9cc5ed63d
--- /dev/null
+++ b/l10n/es/metadata.inc
@@ -0,0 +1,8 @@
+    <em:localized>
+      <Description>
+        <em:locale>es</em:locale>
+        <em:name>Visor de PDF</em:name>
+        <em:description>Usa HTML5 para mostrar archivos PDF directamente en Firefox.</em:description>
+      </Description>
+    </em:localized>
+
diff --git a/l10n/es/viewer.properties b/l10n/es/viewer.properties
new file mode 100644
index 000000000..6429ba001
--- /dev/null
+++ b/l10n/es/viewer.properties
@@ -0,0 +1,89 @@
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=Página anterior
+previous_label=Anterior
+next.title=Página siguiente
+next_label=Siguiente
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Página:
+page_of=of {{pageCount}}
+
+zoom_out.title=Reducir
+zoom_out_label=Reducir
+zoom_in.title=Ampliar
+zoom_in_label=Ampliar
+zoom.title=Ampliación
+print.title=Imprimir
+print_label=imprimir
+open_file.title=Abrir archivo
+open_file_label=Abrir
+download.title=Descargar
+download_label=Descargar
+bookmark.title=Vista actual (copiar o abrir en una ventana nueva)
+bookmark_label=Vista actual
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Alternar deslizador
+toggle_slider_label=Alternar deslizador
+outline.title=Mostrar esquema del documento
+outline_label=Esquema del documento
+thumbs.title=Mostrar miniaturas
+thumbs_label=Miniaturas
+search_panel.title=Buscar en el documento
+search_panel_label=Buscar
+
+# Document outline messages
+no_outline=No hay un esquema disponible
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Página {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Miniatura de la página {{page}}
+
+# Search panel button title and messages
+search=Buscar
+search_terms_not_found=(No encontrado)
+
+# Error panel labels
+error_more_info=Más información
+error_less_info=Menos información
+error_close=Cerrar
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=Compil. PDF.JS: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Mensaje: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Pila: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Archivo: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Línea: {{line}}
+rendering_error=An error occurred while rendering the page.
+
+# Predefined zoom values
+page_scale_width=Anchura de página
+page_scale_fit=Ajustar a la página
+page_scale_auto=Ampliación automática
+page_scale_actual=Tamaño real
+
+# Loading indicator messages
+loading_error_indicator=Error
+loading_error=Ocurrió un error al cargar el PDF.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[Anotación {{type}}]
+request_password=El PDF está protegido por una contraseña:

From 9e8838756b37d88a83ced30c7535290a503249ab Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Wed, 4 Jul 2012 22:38:43 -0500
Subject: [PATCH 24/27] Small fix

---
 l10n/es/viewer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n/es/viewer.properties b/l10n/es/viewer.properties
index 6429ba001..90bf19b93 100644
--- a/l10n/es/viewer.properties
+++ b/l10n/es/viewer.properties
@@ -9,7 +9,7 @@ next_label=Siguiente
 # Do not translate "{{pageCount}}", it will be substituted with a number
 # representing the total number of pages.
 page_label=Página:
-page_of=of {{pageCount}}
+page_of=de {{pageCount}}
 
 zoom_out.title=Reducir
 zoom_out_label=Reducir

From 9762275b44ea393068371d02463c6c8bd10c8ee7 Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Wed, 4 Jul 2012 22:44:22 -0500
Subject: [PATCH 25/27] Moar small fixes

Dah.
---
 l10n/es/viewer.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/l10n/es/viewer.properties b/l10n/es/viewer.properties
index 90bf19b93..8e7080d03 100644
--- a/l10n/es/viewer.properties
+++ b/l10n/es/viewer.properties
@@ -17,7 +17,7 @@ zoom_in.title=Ampliar
 zoom_in_label=Ampliar
 zoom.title=Ampliación
 print.title=Imprimir
-print_label=imprimir
+print_label=Imprimir
 open_file.title=Abrir archivo
 open_file_label=Abrir
 download.title=Descargar
@@ -58,7 +58,7 @@ error_less_info=Menos información
 error_close=Cerrar
 # LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
 # build ID.
-error_build=Compil. PDF.JS: {{build}}
+error_build=Compilación de PDF.JS: {{build}}
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
 error_message=Mensaje: {{message}}
@@ -69,7 +69,7 @@ error_stack=Pila: {{stack}}
 error_file=Archivo: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
 error_line=Línea: {{line}}
-rendering_error=An error occurred while rendering the page.
+rendering_error=Ocurrió un error al renderizar la página.
 
 # Predefined zoom values
 page_scale_width=Anchura de página
@@ -86,4 +86,4 @@ loading_error=Ocurrió un error al cargar el PDF.
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[Anotación {{type}}]
-request_password=El PDF está protegido por una contraseña:
+request_password=El PDF está protegido con una contraseña:

From f9f715b656059b2e43b2fe34bedb9bd28b8a0dff Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 9 Jul 2012 12:13:03 -0500
Subject: [PATCH 26/27] Adds lossless segment types; fixes generic region
 prediction flag

---
 src/jbig2.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/jbig2.js b/src/jbig2.js
index 239b9fefb..4746a6bb6 100644
--- a/src/jbig2.js
+++ b/src/jbig2.js
@@ -795,6 +795,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                 data, position, end];
         break;
       case 6: // ImmediateTextRegion
+      case 7: // ImmediateLosslessTextRegion
         var textRegion = {};
         textRegion.info = readRegionSegmentInformation(data, position);
         position += RegionSegmentInformationFieldLength;
@@ -841,13 +842,14 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         args = [textRegion, header.referredTo, data, position, end];
         break;
       case 38: // ImmediateGenericRegion
+      case 39: // ImmediateLosslessGenericRegion
         var genericRegion = {};
         genericRegion.info = readRegionSegmentInformation(data, position);
         position += RegionSegmentInformationFieldLength;
         var genericRegionSegmentFlags = data[position++];
         genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
         genericRegion.template = (genericRegionSegmentFlags >> 1) & 3;
-        genericRegion.prediction = !!(genericRegionSegmentFlags & 4);
+        genericRegion.prediction = !!(genericRegionSegmentFlags & 8);
         if (!genericRegion.mmr) {
           var atLength = genericRegion.template == 0 ? 4 : 1;
           var at = [];
@@ -988,6 +990,10 @@ var Jbig2Image = (function Jbig2ImageClosure() {
                                 region.at, decodingContext);
       this.drawBitmap(regionInfo, bitmap);
     },
+    onImmediateLosslessGenericRegion:
+      function SimpleSegmentVisitor_onImmediateLosslessGenericRegion() {
+      this.onImmediateGenericRegion.apply(this, arguments);
+    },
     onSymbolDictionary:
       function SimpleSegmentVisitor_onSymbolDictionary(dictionary,
                                                        currentSegment,
@@ -1036,6 +1042,10 @@ var Jbig2Image = (function Jbig2ImageClosure() {
         region.referenceCorner, region.combinationOperator, huffmanTables,
         region.refinementTemplate, region.refinementAt, decodingContext);
       this.drawBitmap(regionInfo, bitmap);
+    },
+    onImmediateLosslessTextRegion:
+      function SimpleSegmentVisitor_onImmediateLosslessTextRegion() {
+        this.onImmediateTextRegion.apply(this, arguments);
     }
   };
 

From 48e115cf30f7217d5d2296330721839fafd7ca41 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 9 Jul 2012 13:59:50 -0500
Subject: [PATCH 27/27] Implements segmentation symbol check for JPX

---
 src/jpx.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/jpx.js b/src/jpx.js
index 63193753d..fdf41f48b 100644
--- a/src/jpx.js
+++ b/src/jpx.js
@@ -254,8 +254,7 @@ var JpxImage = (function JpxImageClosure() {
                   cod.selectiveArithmeticCodingBypass ||
                   cod.resetContextProbabilities ||
                   cod.terminationOnEachCodingPass ||
-                  cod.verticalyStripe || cod.predictableTermination ||
-                  cod.segmentationSymbolUsed)
+                  cod.verticalyStripe || cod.predictableTermination)
                 throw 'Unsupported COD options: ' + uneval(cod);
 
               if (context.mainHeader)
@@ -832,7 +831,8 @@ var JpxImage = (function JpxImageClosure() {
     return position;
   }
   function copyCoefficients(coefficients, x0, y0, width, height,
-                            delta, mb, codeblocks, transformation) {
+                            delta, mb, codeblocks, transformation,
+                            segmentationSymbolUsed) {
     var r = 0.5; // formula (E-6)
     for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
       var codeblock = codeblocks[i];
@@ -876,6 +876,8 @@ var JpxImage = (function JpxImageClosure() {
             break;
           case 2:
             bitModel.runCleanupPass();
+            if (segmentationSymbolUsed)
+              bitModel.checkSegmentationSymbol();
             break;
         }
         currentCodingpassType = (currentCodingpassType + 1) % 3;
@@ -912,6 +914,7 @@ var JpxImage = (function JpxImageClosure() {
     var scalarExpounded = quantizationParameters.scalarExpounded;
     var guardBits = quantizationParameters.guardBits;
     var transformation = codingStyleParameters.transformation;
+    var segmentationSymbolUsed = codingStyleParameters.segmentationSymbolUsed;
     var precision = context.components[c].precision;
 
     var subbandCoefficients = [];
@@ -942,7 +945,8 @@ var JpxImage = (function JpxImageClosure() {
 
         var coefficients = new Float32Array(width * height);
         copyCoefficients(coefficients, subband.tbx0, subband.tby0,
-          width, height, delta, mb, subband.codeblocks, transformation);
+          width, height, delta, mb, subband.codeblocks, transformation,
+          segmentationSymbolUsed);
 
         subbandCoefficients.push({
           width: width,
@@ -1645,6 +1649,14 @@ var JpxImage = (function JpxImageClosure() {
             }
           }
         }
+      },
+      checkSegmentationSymbol: function BitModel_checkSegmentationSymbol() {
+        var decoder = this.decoder;
+        var cx = this.uniformContext;
+        var symbol = (decoder.readBit(cx) << 3) | (decoder.readBit(cx) << 2) |
+                     (decoder.readBit(cx) << 1) | decoder.readBit(cx);
+        if (symbol != 0xA)
+          throw 'Invalid segmentation symbol';
       }
     };