diff options
| author | jhurst <jhurst@cinecert.com> | 2019-11-28 10:15:10 -0800 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2019-11-28 10:15:10 -0800 |
| commit | 20c2f749a4593c418259bcf8b5f6f0775b70d910 (patch) | |
| tree | 0ae01e2643c5b5b7362cb39e1b6581b960389dce /src/Metadata.cpp | |
| parent | 7ce81497e2592d5787b9a4285d6a89ae09f79022 (diff) | |
fixed to implement an array rather than a scalar of ui16_t
Diffstat (limited to 'src/Metadata.cpp')
| -rwxr-xr-x | src/Metadata.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Metadata.cpp b/src/Metadata.cpp index d81b70a..8e1c3a7 100755 --- a/src/Metadata.cpp +++ b/src/Metadata.cpp @@ -2129,8 +2129,8 @@ JPEG2000PictureSubDescriptor::InitFromTLVSet(TLVReader& TLVSet) result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KExtendedCapabilities)); J2KExtendedCapabilities.set_has_value( result == RESULT_OK ); } - if ( ASDCP_SUCCESS(result) ) { - result = TLVSet.ReadUi16(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); + if ( ASDCP_SUCCESS(result) ) { + result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); J2KProfile.set_has_value( result == RESULT_OK ); } if ( ASDCP_SUCCESS(result) ) { @@ -2161,7 +2161,7 @@ JPEG2000PictureSubDescriptor::WriteToTLVSet(TLVWriter& TLVSet) if ( ASDCP_SUCCESS(result) && ! QuantizationDefault.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, QuantizationDefault)); if ( ASDCP_SUCCESS(result) && ! J2CLayout.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2CLayout)); if ( ASDCP_SUCCESS(result) && ! J2KExtendedCapabilities.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KExtendedCapabilities)); - if ( ASDCP_SUCCESS(result) && ! J2KProfile.empty() ) result = TLVSet.WriteUi16(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); + if ( ASDCP_SUCCESS(result) && ! J2KProfile.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); if ( ASDCP_SUCCESS(result) && ! J2KCorrespondingProfile.empty() ) result = TLVSet.WriteUi16(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); return result; } @@ -2227,7 +2227,8 @@ JPEG2000PictureSubDescriptor::Dump(FILE* stream) fprintf(stream, " %22s = %s\n", "J2KExtendedCapabilities", J2KExtendedCapabilities.get().EncodeString(identbuf, IdentBufferLen)); } if ( ! J2KProfile.empty() ) { - fprintf(stream, " %22s = %d\n", "J2KProfile", J2KProfile.get()); + fprintf(stream, " %22s:\n", "J2KProfile"); + J2KProfile.get().Dump(stream); } if ( ! J2KCorrespondingProfile.empty() ) { fprintf(stream, " %22s = %d\n", "J2KCorrespondingProfile", J2KCorrespondingProfile.get()); |