diff options
Diffstat (limited to 'src/Metadata.cpp')
| -rwxr-xr-x | src/Metadata.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Metadata.cpp b/src/Metadata.cpp index 8e1c3a7..9fce0b3 100755 --- a/src/Metadata.cpp +++ b/src/Metadata.cpp @@ -2133,8 +2133,8 @@ JPEG2000PictureSubDescriptor::InitFromTLVSet(TLVReader& TLVSet) result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); J2KProfile.set_has_value( result == RESULT_OK ); } - if ( ASDCP_SUCCESS(result) ) { - result = TLVSet.ReadUi16(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); + if ( ASDCP_SUCCESS(result) ) { + result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); J2KCorrespondingProfile.set_has_value( result == RESULT_OK ); } return result; @@ -2162,7 +2162,7 @@ JPEG2000PictureSubDescriptor::WriteToTLVSet(TLVWriter& TLVSet) 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.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); - if ( ASDCP_SUCCESS(result) && ! J2KCorrespondingProfile.empty() ) result = TLVSet.WriteUi16(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); + if ( ASDCP_SUCCESS(result) && ! J2KCorrespondingProfile.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); return result; } @@ -2228,10 +2228,11 @@ JPEG2000PictureSubDescriptor::Dump(FILE* stream) } if ( ! J2KProfile.empty() ) { fprintf(stream, " %22s:\n", "J2KProfile"); - J2KProfile.get().Dump(stream); + J2KProfile.get().Dump(stream); } if ( ! J2KCorrespondingProfile.empty() ) { - fprintf(stream, " %22s = %d\n", "J2KCorrespondingProfile", J2KCorrespondingProfile.get()); + fprintf(stream, " %22s:\n", "J2KCorrespondingProfile"); + J2KCorrespondingProfile.get().Dump(stream); } } |