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: change m_scaledFrame to m_scaledSize Author: Bård Eirik Winther <bwint...@cisco.com> Date: Fri Aug 9 11:12:07 2013 +0000 Signed-off-by: Bård Eirik Winther <bwint...@cisco.com> Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> utils/qv4l2/capture-win-qt.cpp | 12 ++++++------ utils/qv4l2/capture-win-qt.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=505eaa61fa37b9bd4d508ca882cefc187ffc84f1 diff --git a/utils/qv4l2/capture-win-qt.cpp b/utils/qv4l2/capture-win-qt.cpp index f746379..82c618c 100644 --- a/utils/qv4l2/capture-win-qt.cpp +++ b/utils/qv4l2/capture-win-qt.cpp @@ -24,8 +24,8 @@ CaptureWinQt::CaptureWinQt() : { CaptureWin::buildWindow(&m_videoSurface); - m_scaledFrame.setWidth(0); - m_scaledFrame.setHeight(0); + m_scaledSize.setWidth(0); + m_scaledSize.setHeight(0); } CaptureWinQt::~CaptureWinQt() @@ -39,9 +39,9 @@ void CaptureWinQt::resizeEvent(QResizeEvent *event) return; QPixmap img = QPixmap::fromImage(*m_frame); - m_scaledFrame = scaleFrameSize(QSize(m_videoSurface.width(), m_videoSurface.height()), + m_scaledSize = scaleFrameSize(QSize(m_videoSurface.width(), m_videoSurface.height()), QSize(m_frame->width(), m_frame->height())); - img = img.scaled(m_scaledFrame.width(), m_scaledFrame.height(), Qt::IgnoreAspectRatio); + img = img.scaled(m_scaledSize.width(), m_scaledSize.height(), Qt::IgnoreAspectRatio); m_videoSurface.setPixmap(img); QWidget::resizeEvent(event); } @@ -56,7 +56,7 @@ void CaptureWinQt::setFrame(int width, int height, __u32 format, unsigned char * if (m_frame->width() != width || m_frame->height() != height || m_frame->format() != dstFmt) { delete m_frame; m_frame = new QImage(width, height, dstFmt); - m_scaledFrame = scaleFrameSize(QSize(m_videoSurface.width(), m_videoSurface.height()), + m_scaledSize = scaleFrameSize(QSize(m_videoSurface.width(), m_videoSurface.height()), QSize(m_frame->width(), m_frame->height())); } @@ -68,7 +68,7 @@ void CaptureWinQt::setFrame(int width, int height, __u32 format, unsigned char * m_information.setText(info); QPixmap img = QPixmap::fromImage(*m_frame); - img = img.scaled(m_scaledFrame.width(), m_scaledFrame.height(), Qt::IgnoreAspectRatio); + img = img.scaled(m_scaledSize.width(), m_scaledSize.height(), Qt::IgnoreAspectRatio); m_videoSurface.setPixmap(img); } diff --git a/utils/qv4l2/capture-win-qt.h b/utils/qv4l2/capture-win-qt.h index 6029109..9faa12f 100644 --- a/utils/qv4l2/capture-win-qt.h +++ b/utils/qv4l2/capture-win-qt.h @@ -48,6 +48,6 @@ private: QImage *m_frame; QLabel m_videoSurface; - QSize m_scaledFrame; + QSize m_scaledSize; }; #endif _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
