From af72e03bd1449bd619fdf2cac1b18c87a627fbc1 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 22 Sep 2014 16:25:36 -0500
Subject: [PATCH] PDF.js version 1.0.312

---
 bower.json            |  2 +-
 build/pdf.combined.js | 14 +++++++++++---
 build/pdf.js          |  4 ++--
 build/pdf.worker.js   | 14 +++++++++++---
 package.json          |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/bower.json b/bower.json
index 0946f8b7d..52a517057 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.310",
+  "version": "1.0.312",
   "keywords": [
     "Mozilla",
     "pdf",
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 4f20a9a69..61e2cb291 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.310';
-PDFJS.build = 'cff2c3a';
+PDFJS.version = '1.0.312';
+PDFJS.build = '12bfd20';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -47157,9 +47157,17 @@ var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) {
     this.h2 = seed ? seed & 0xffffffff : SEED;
   }
 
+  var alwaysUseUint32ArrayView = false;
+  // old webkits have issues with non-aligned arrays
+  try {
+    new Uint32Array(new Uint8Array(5).buffer, 0, 1);
+  } catch (e) {
+    alwaysUseUint32ArrayView = true;
+  }
+
   MurmurHash3_64.prototype = {
     update: function MurmurHash3_64_update(input) {
-      var useUint32ArrayView = false;
+      var useUint32ArrayView = alwaysUseUint32ArrayView;
       var i;
       if (typeof input == 'string') {
         var data = new Uint8Array(input.length * 2);
diff --git a/build/pdf.js b/build/pdf.js
index 97e97c81c..16e749ebf 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.310';
-PDFJS.build = 'cff2c3a';
+PDFJS.version = '1.0.312';
+PDFJS.build = '12bfd20';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 6f9b0f71a..72652a12b 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.310';
-PDFJS.build = 'cff2c3a';
+PDFJS.version = '1.0.312';
+PDFJS.build = '12bfd20';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -42650,9 +42650,17 @@ var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) {
     this.h2 = seed ? seed & 0xffffffff : SEED;
   }
 
+  var alwaysUseUint32ArrayView = false;
+  // old webkits have issues with non-aligned arrays
+  try {
+    new Uint32Array(new Uint8Array(5).buffer, 0, 1);
+  } catch (e) {
+    alwaysUseUint32ArrayView = true;
+  }
+
   MurmurHash3_64.prototype = {
     update: function MurmurHash3_64_update(input) {
-      var useUint32ArrayView = false;
+      var useUint32ArrayView = alwaysUseUint32ArrayView;
       var i;
       if (typeof input == 'string') {
         var data = new Uint8Array(input.length * 2);
diff --git a/package.json b/package.json
index 324043953..94cb9005b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.310",
+  "version": "1.0.312",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",