Changeset 1347 in SHVCSoftware for branches/SHM-dev

Timestamp:

22 Jul 2015, 03:04:30 (9 years ago)

Author:

seregin

Message:

port rev 4425

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComBitStream.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComBitStream.cpp

@@ -373 +373 @@
   {
     std::size_t currentOutputBufferSize=buf.size();
-    const UInt uiNumBytesToReadFromFifo = std::min<UInt>(uiNumBytes, m_fifo.size() - m_fifo_idx);
+    const UInt uiNumBytesToReadFromFifo = std::min<UInt>(uiNumBytes, (UInt)m_fifo.size() - m_fifo_idx);
     buf.resize(currentOutputBufferSize+uiNumBytes);
     memcpy(&(buf[currentOutputBufferSize]), &(m_fifo[m_fifo_idx]), uiNumBytesToReadFromFifo); m_fifo_idx+=uiNumBytesToReadFromFifo;