This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: qv4l2: fix incorrect handling of return value of v4lconvert_convert Author: Hans Verkuil <[email protected]> Date: Wed Jun 13 13:47:44 2012 +0200 Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit af8722f5dc71fac91fb9cb93eca28f368ec74e13) Signed-off-by: Gregor Jasny <[email protected]> utils/qv4l2/qv4l2.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=058d4b5fa9bbff70e08d47b9e8053fdd356ac389 diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index 2ddaf29..749e421 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -289,7 +289,7 @@ void ApplicationWindow::capFrame() err = v4lconvert_convert(m_convertData, &m_capSrcFormat, &m_capDestFormat, m_frameData, s, m_capImage->bits(), m_capDestFormat.fmt.pix.sizeimage); - if (!m_mustConvert || err) + if (!m_mustConvert || err < 0) memcpy(m_capImage->bits(), m_frameData, std::min(s, m_capImage->numBytes())); break; @@ -308,7 +308,7 @@ void ApplicationWindow::capFrame() &m_capSrcFormat, &m_capDestFormat, (unsigned char *)m_buffers[buf.index].start, buf.bytesused, m_capImage->bits(), m_capDestFormat.fmt.pix.sizeimage); - if (!m_mustConvert || err) + if (!m_mustConvert || err < 0) memcpy(m_capImage->bits(), (unsigned char *)m_buffers[buf.index].start, std::min(buf.bytesused, (unsigned)m_capImage->numBytes())); @@ -332,7 +332,7 @@ void ApplicationWindow::capFrame() &m_capSrcFormat, &m_capDestFormat, (unsigned char *)buf.m.userptr, buf.bytesused, m_capImage->bits(), m_capDestFormat.fmt.pix.sizeimage); - if (!m_mustConvert || err) + if (!m_mustConvert || err < 0) memcpy(m_capImage->bits(), (unsigned char *)buf.m.userptr, std::min(buf.bytesused, (unsigned)m_capImage->numBytes())); } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
