Merge pull request #5567 from CodingFabian/fixup-5439
Add marker segment (PLT, PLM) and refactor TLM
This commit is contained in:
commit
465f52e7ce
@ -187,11 +187,6 @@ var JpxImage = (function JpxImageClosure() {
|
||||
context.QCC = [];
|
||||
context.COC = [];
|
||||
break;
|
||||
case 0xFF55: // Tile-part lengths, main header (TLM)
|
||||
var Ltlm = readUint16(data, position); // Marker segment length
|
||||
// Skip tile length markers
|
||||
position += Ltlm;
|
||||
break;
|
||||
case 0xFF5C: // Quantization default (QCD)
|
||||
length = readUint16(data, position);
|
||||
var qcd = {};
|
||||
@ -381,6 +376,9 @@ var JpxImage = (function JpxImageClosure() {
|
||||
length = tile.dataEnd - position;
|
||||
parseTilePackets(context, data, position, length);
|
||||
break;
|
||||
case 0xFF55: // Tile-part lengths, main header (TLM)
|
||||
case 0xFF57: // Packet length, main header (PLM)
|
||||
case 0xFF58: // Packet length, tile-part header (PLT)
|
||||
case 0xFF64: // Comment (COM)
|
||||
length = readUint16(data, position);
|
||||
// skipping content
|
||||
@ -721,7 +719,7 @@ var JpxImage = (function JpxImageClosure() {
|
||||
r = 0;
|
||||
c = 0;
|
||||
p = 0;
|
||||
|
||||
|
||||
this.nextPacket = function JpxImage_nextPacket() {
|
||||
// Section B.12.1.3 Resolution-position-component-layer
|
||||
for (; r <= maxDecompositionLevelsCount; r++) {
|
||||
@ -805,7 +803,7 @@ var JpxImage = (function JpxImageClosure() {
|
||||
var componentsCount = siz.Csiz;
|
||||
var precinctsSizes = getPrecinctSizesInImageScale(tile);
|
||||
var l = 0, r = 0, c = 0, px = 0, py = 0;
|
||||
|
||||
|
||||
this.nextPacket = function JpxImage_nextPacket() {
|
||||
// Section B.12.1.5 Component-position-resolution-layer
|
||||
for (; c < componentsCount; ++c) {
|
||||
|
Loading…
Reference in New Issue
Block a user