-
Notifications
You must be signed in to change notification settings - Fork 10.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9073 from Snuffleupagus/image-streams-fixes
Fix the interface of `JpegStream`/`JpxStream`/`Jbig2Stream` to agree with the other `DecodeStream`s
- Loading branch information
Showing
7 changed files
with
238 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* Copyright 2012 Mozilla Foundation | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| import { createObjectURL, shadow } from '../shared/util'; | ||
| import { DecodeStream } from './stream'; | ||
| import { isDict } from './primitives'; | ||
| import { JpegImage } from './jpg'; | ||
|
|
||
| /** | ||
| * Depending on the type of JPEG a JpegStream is handled in different ways. For | ||
| * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image | ||
| * data is stored and then loaded by the browser. For unsupported JPEG's we use | ||
| * a library to decode these images and the stream behaves like all the other | ||
| * DecodeStreams. | ||
| */ | ||
| let JpegStream = (function JpegStreamClosure() { | ||
| function JpegStream(stream, maybeLength, dict, params) { | ||
| // Some images may contain 'junk' before the SOI (start-of-image) marker. | ||
| // Note: this seems to mainly affect inline images. | ||
| let ch; | ||
| while ((ch = stream.getByte()) !== -1) { | ||
| if (ch === 0xFF) { // Find the first byte of the SOI marker (0xFFD8). | ||
| stream.skip(-1); // Reset the stream position to the SOI. | ||
| break; | ||
| } | ||
| } | ||
| this.stream = stream; | ||
| this.maybeLength = maybeLength; | ||
| this.dict = dict; | ||
| this.params = params; | ||
|
|
||
| DecodeStream.call(this, maybeLength); | ||
| } | ||
|
|
||
| JpegStream.prototype = Object.create(DecodeStream.prototype); | ||
|
|
||
| Object.defineProperty(JpegStream.prototype, 'bytes', { | ||
| get: function JpegStream_bytes() { | ||
| // If `this.maybeLength` is null, we'll get the entire stream. | ||
| return shadow(this, 'bytes', this.stream.getBytes(this.maybeLength)); | ||
| }, | ||
| configurable: true, | ||
| }); | ||
|
|
||
| JpegStream.prototype.ensureBuffer = function(requested) { | ||
| // No-op, since `this.readBlock` will always parse the entire image and | ||
| // directly insert all of its data into `this.buffer`. | ||
| }; | ||
|
|
||
| JpegStream.prototype.readBlock = function() { | ||
| if (this.eof) { | ||
| return; | ||
| } | ||
| let jpegImage = new JpegImage(); | ||
|
|
||
| // Checking if values need to be transformed before conversion. | ||
| let decodeArr = this.dict.getArray('Decode', 'D'); | ||
| if (this.forceRGB && Array.isArray(decodeArr)) { | ||
| let bitsPerComponent = this.dict.get('BitsPerComponent') || 8; | ||
| let decodeArrLength = decodeArr.length; | ||
| let transform = new Int32Array(decodeArrLength); | ||
| let transformNeeded = false; | ||
| let maxValue = (1 << bitsPerComponent) - 1; | ||
| for (let i = 0; i < decodeArrLength; i += 2) { | ||
| transform[i] = ((decodeArr[i + 1] - decodeArr[i]) * 256) | 0; | ||
| transform[i + 1] = (decodeArr[i] * maxValue) | 0; | ||
| if (transform[i] !== 256 || transform[i + 1] !== 0) { | ||
| transformNeeded = true; | ||
| } | ||
| } | ||
| if (transformNeeded) { | ||
| jpegImage.decodeTransform = transform; | ||
| } | ||
| } | ||
| // Fetching the 'ColorTransform' entry, if it exists. | ||
| if (isDict(this.params)) { | ||
| let colorTransform = this.params.get('ColorTransform'); | ||
| if (Number.isInteger(colorTransform)) { | ||
| jpegImage.colorTransform = colorTransform; | ||
| } | ||
| } | ||
|
|
||
| jpegImage.parse(this.bytes); | ||
| let data = jpegImage.getData(this.drawWidth, this.drawHeight, | ||
| this.forceRGB); | ||
| this.buffer = data; | ||
| this.bufferLength = data.length; | ||
| this.eof = true; | ||
| }; | ||
|
|
||
| JpegStream.prototype.getBytes = function(length) { | ||
| this.readBlock(); | ||
| return this.buffer; | ||
| }; | ||
|
|
||
| JpegStream.prototype.getIR = function(forceDataSchema = false) { | ||
| return createObjectURL(this.bytes, 'image/jpeg', forceDataSchema); | ||
| }; | ||
|
|
||
| return JpegStream; | ||
| })(); | ||
|
|
||
| export { | ||
| JpegStream, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* Copyright 2012 Mozilla Foundation | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| import { DecodeStream } from './stream'; | ||
| import { JpxImage } from './jpx'; | ||
| import { shadow } from '../shared/util'; | ||
|
|
||
| /** | ||
| * For JPEG 2000's we use a library to decode these images and | ||
| * the stream behaves like all the other DecodeStreams. | ||
| */ | ||
| let JpxStream = (function JpxStreamClosure() { | ||
| function JpxStream(stream, maybeLength, dict, params) { | ||
| this.stream = stream; | ||
| this.maybeLength = maybeLength; | ||
| this.dict = dict; | ||
| this.params = params; | ||
|
|
||
| DecodeStream.call(this, maybeLength); | ||
| } | ||
|
|
||
| JpxStream.prototype = Object.create(DecodeStream.prototype); | ||
|
|
||
| Object.defineProperty(JpxStream.prototype, 'bytes', { | ||
| get: function JpxStream_bytes() { | ||
| // If `this.maybeLength` is null, we'll get the entire stream. | ||
| return shadow(this, 'bytes', this.stream.getBytes(this.maybeLength)); | ||
| }, | ||
| configurable: true, | ||
| }); | ||
|
|
||
| JpxStream.prototype.ensureBuffer = function(requested) { | ||
| // No-op, since `this.readBlock` will always parse the entire image and | ||
| // directly insert all of its data into `this.buffer`. | ||
| }; | ||
|
|
||
| JpxStream.prototype.readBlock = function() { | ||
| if (this.eof) { | ||
| return; | ||
| } | ||
| let jpxImage = new JpxImage(); | ||
| jpxImage.parse(this.bytes); | ||
|
|
||
| let width = jpxImage.width; | ||
| let height = jpxImage.height; | ||
| let componentsCount = jpxImage.componentsCount; | ||
| let tileCount = jpxImage.tiles.length; | ||
| if (tileCount === 1) { | ||
| this.buffer = jpxImage.tiles[0].items; | ||
| } else { | ||
| let data = new Uint8ClampedArray(width * height * componentsCount); | ||
|
|
||
| for (let k = 0; k < tileCount; k++) { | ||
| let tileComponents = jpxImage.tiles[k]; | ||
| let tileWidth = tileComponents.width; | ||
| let tileHeight = tileComponents.height; | ||
| let tileLeft = tileComponents.left; | ||
| let tileTop = tileComponents.top; | ||
|
|
||
| let src = tileComponents.items; | ||
| let srcPosition = 0; | ||
| let dataPosition = (width * tileTop + tileLeft) * componentsCount; | ||
| let imgRowSize = width * componentsCount; | ||
| let tileRowSize = tileWidth * componentsCount; | ||
|
|
||
| for (let j = 0; j < tileHeight; j++) { | ||
| let rowBytes = src.subarray(srcPosition, srcPosition + tileRowSize); | ||
| data.set(rowBytes, dataPosition); | ||
| srcPosition += tileRowSize; | ||
| dataPosition += imgRowSize; | ||
| } | ||
| } | ||
| this.buffer = data; | ||
| } | ||
| this.bufferLength = this.buffer.length; | ||
| this.eof = true; | ||
| }; | ||
|
|
||
| return JpxStream; | ||
| })(); | ||
|
|
||
| export { | ||
| JpxStream, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.