From ac0ae3e5fd94660bf90535bcdb12c544b9c3fd18 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Thu, 23 Aug 2012 16:12:33 -0500 Subject: [PATCH] Merges new jpgjs: fixes invalid JPEG marker. --- external/jpgjs/LICENSE | 31 ++++++++++++------------------- external/jpgjs/jpg.js | 27 +++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/external/jpgjs/LICENSE b/external/jpgjs/LICENSE index f28619c6a..1e29c87c8 100644 --- a/external/jpgjs/LICENSE +++ b/external/jpgjs/LICENSE @@ -1,24 +1,17 @@ -Copyright (C) 2011 by notmasteryet + Copyright (C) 2011 notmasteryet -Contributors: Yury Delendik - Brendan Dahl + Contributors: Yury Delendik + Brendan Dahl -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. + http://www.apache.org/licenses/LICENSE-2.0 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/external/jpgjs/jpg.js b/external/jpgjs/jpg.js index 103153d9d..941d01a87 100644 --- a/external/jpgjs/jpg.js +++ b/external/jpgjs/jpg.js @@ -1,5 +1,20 @@ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- / /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ +/* + Copyright 2011 notmasteryet + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ // - The JPEG specification can be found in the ITU CCITT Recommendation T.81 // (www.w3.org/Graphics/JPEG/itu-t81.pdf) @@ -627,8 +642,9 @@ var JpegImage = (function jpegImage() { break; case 0xFFDB: // DQT (Define Quantization Tables) - var quantizationTableCount = Math.floor((readUint16() - 2) / 65); - for (i = 0; i < quantizationTableCount; i++) { + var quantizationTablesLength = readUint16(); + var quantizationTablesEnd = quantizationTablesLength + offset - 2; + while (offset < quantizationTablesEnd) { var quantizationTableSpec = data[offset++]; var tableData = new Int32Array(64); if ((quantizationTableSpec >> 4) === 0) { // 8 bit values @@ -721,6 +737,13 @@ var JpegImage = (function jpegImage() { offset += processed; break; default: + if (data[offset - 3] == 0xFF && + data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) { + // could be incorrect encoding -- last 0xFF byte of the previous + // block was eaten by the encoder + offset -= 3; + break; + } throw "unknown JPEG marker " + fileMarker.toString(16); } fileMarker = readUint16();