Merge pull request #5881 from alalek:fix_5878

512e73db · Alexander Alekhin · 9012ff47 · 6b4d4a85 · 512e73db
Commit 512e73db authored Jan 04, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_mjpeg_decoder.cpp modules/videoio/src/cap_mjpeg_decoder.cpp +1 -1

No files found.
--- a/modules/videoio/src/cap_mjpeg_decoder.cpp
+++ b/modules/videoio/src/cap_mjpeg_decoder.cpp
@@ -790,7 +790,7 @@ std::vector<char> MotionJpegCapture::readFrame(frame_iterator it)
    result.reserve(chunk.m_size);
    result.resize(chunk.m_size);

-    m_file_stream.read(result.data(), chunk.m_size);
+    m_file_stream.read(&(result[0]), chunk.m_size); // result.data() failed with MSVS2008

    return result;
 }