diff options
| author | jhurst <jhurst@cinecert.com> | 2014-05-14 20:21:00 +0000 |
|---|---|---|
| committer | jhurst <> | 2014-05-14 20:21:00 +0000 |
| commit | 6de07d0a33aec56c8a650054b1b747768d696416 (patch) | |
| tree | 2fff0dcfbb7828292415d9cb2e88bb809fa73d8e /src/AS_DCP_JP2K.cpp | |
| parent | d034fac6412c03427ec1145e7171ec215542ab09 (diff) | |
less strict UL checking ignores version byte
Diffstat (limited to 'src/AS_DCP_JP2K.cpp')
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 62c9e78..635eae5 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -69,7 +69,7 @@ ASDCP::JP2K::operator << (std::ostream& strm, const PictureDescriptor& PDesc) strm << " bits h-sep v-sep" << std::endl; ui32_t i; - for ( i = 0; i < PDesc.Csize; i++ ) + for ( i = 0; i < PDesc.Csize && i < MaxComponents; ++i ) { strm << " " << std::setw(4) << PDesc.ImageComponents[i].Ssize + 1 /* See ISO 15444-1, Table A11, for the origin of '+1' */ << " " << std::setw(5) << PDesc.ImageComponents[i].XRsize @@ -90,13 +90,13 @@ ASDCP::JP2K::operator << (std::ostream& strm, const PictureDescriptor& PDesc) ui32_t precinct_set_size = 0; - for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; i++ ) + for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; ++i ) precinct_set_size++; strm << " Precincts: " << (short) precinct_set_size << std::endl; strm << "precinct dimensions:" << std::endl; - for ( i = 0; i < precinct_set_size; i++ ) + for ( i = 0; i < precinct_set_size && i < MaxPrecincts; ++i ) strm << " " << i + 1 << ": " << s_exp_lookup[PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]&0x0f] << " x " << s_exp_lookup[(PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]>>4)&0x0f] << std::endl; @@ -154,7 +154,7 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) fprintf(stream, " bits h-sep v-sep\n"); ui32_t i; - for ( i = 0; i < PDesc.Csize; i++ ) + for ( i = 0; i < PDesc.Csize && i < MaxComponents; i++ ) { fprintf(stream, " %4d %5d %5d\n", PDesc.ImageComponents[i].Ssize + 1, // See ISO 15444-1, Table A11, for the origin of '+1' @@ -178,13 +178,13 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) ui32_t precinct_set_size = 0; - for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; i++ ) + for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; ++i ) precinct_set_size++; fprintf(stream, " Precincts: %hd\n", precinct_set_size); fprintf(stream, "precinct dimensions:\n"); - for ( i = 0; i < precinct_set_size; i++ ) + for ( i = 0; i < precinct_set_size && i < MaxPrecincts; i++ ) fprintf(stream, " %d: %d x %d\n", i + 1, s_exp_lookup[PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]&0x0f], s_exp_lookup[(PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]>>4)&0x0f] |