diff options
| author | msheby <msheby@cinecert.com> | 2008-02-01 00:42:18 +0000 |
|---|---|---|
| committer | msheby <> | 2008-02-01 00:42:18 +0000 |
| commit | 3e1ee0a500bd0b513db4bdf18a9cb052f42404d4 (patch) | |
| tree | 4788b1c75799823d902501c0b21f80d8ec2c59fb /src/h__Reader.cpp | |
| parent | bc0f567deda4c1f06d8910bc5ccd65ffc72b7b34 (diff) | |
Commit a bunch of portability fixes (64- vs. 32-bit types).
Diffstat (limited to 'src/h__Reader.cpp')
| -rwxr-xr-x | src/h__Reader.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp index 8d844f3..d329e60 100755 --- a/src/h__Reader.cpp +++ b/src/h__Reader.cpp @@ -224,9 +224,11 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra } // read encrypted triplet value into internal buffer - m_CtFrameBuf.Capacity(PacketLength); + assert(PacketLength <= 0xFFFFFFFFL); + m_CtFrameBuf.Capacity((ui32_t) PacketLength); ui32_t read_count; - result = m_File.Read(m_CtFrameBuf.Data(), PacketLength, &read_count); + result = m_File.Read(m_CtFrameBuf.Data(), (ui32_t) PacketLength, + &read_count); if ( ASDCP_FAILURE(result) ) return result; @@ -237,7 +239,7 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra return RESULT_FORMAT; } - m_CtFrameBuf.Size(PacketLength); + m_CtFrameBuf.Size((ui32_t) PacketLength); // should be const but mxflib::ReadBER is not byte_t* ess_p = m_CtFrameBuf.Data(); @@ -357,7 +359,8 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra // read the data into the supplied buffer ui32_t read_count; - result = m_File.Read(FrameBuf.Data(), PacketLength, &read_count); + assert(PacketLength <= 0xFFFFFFFFL); + result = m_File.Read(FrameBuf.Data(), (ui32_t) PacketLength, &read_count); if ( ASDCP_FAILURE(result) ) return result; |