generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt add byte per line information to fix a bug

Browse Source
This commit is contained in:
Yannick Verdie
2010-08-24 16:18:32 +00:00
parent 601e9af9f8
commit 24427d593f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/window_QT.cpp
View File

@@ -2348,7 +2348,7 @@ void ViewPort::updateImage(const CvArr *arr)
cvReleaseMat(&image2Draw_mat); cvReleaseMat(&image2Draw_mat);
//the image in ipl (to do a deep copy with cvCvtColor) //the image in ipl (to do a deep copy with cvCvtColor)
image2Draw_mat = cvCreateMat( mat->rows, mat->cols, CV_8UC3 ); image2Draw_mat = cvCreateMat( mat->rows, mat->cols, CV_8UC3 );
image2Draw_qt = QImage((uchar*) image2Draw_mat->data.ptr, image2Draw_mat->cols, image2Draw_mat->rows,QImage::Format_RGB888); image2Draw_qt = QImage(image2Draw_mat->data.ptr, image2Draw_mat->cols,image2Draw_mat->rows, image2Draw_mat->step,QImage::Format_RGB888);
//use to compute mouse coordinate, I need to update the ratio here and in resizeEvent //use to compute mouse coordinate, I need to update the ratio here and in resizeEvent
ratioX=width()/float(image2Draw_mat->cols); ratioX=width()/float(image2Draw_mat->cols);
@@ -2717,10 +2717,9 @@ void ViewPort::paintEvent(QPaintEvent* event)
void ViewPort::draw2D(QPainter *painter) void ViewPort::draw2D(QPainter *painter)
{ {
image2Draw_qt = QImage((uchar*) image2Draw_mat->data.ptr, image2Draw_mat->cols, image2Draw_mat->rows,QImage::Format_RGB888); image2Draw_qt = QImage(image2Draw_mat->data.ptr, image2Draw_mat->cols, image2Draw_mat->rows,image2Draw_mat->step,QImage::Format_RGB888);
image2Draw_qt_resized = image2Draw_qt.scaled(viewport()->width(),viewport()->height(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation); image2Draw_qt_resized = image2Draw_qt.scaled(viewport()->width(),viewport()->height(),Qt::IgnoreAspectRatio,Qt::FastTransformation);//Qt::SmoothTransformation);
painter->drawImage(0,0,image2Draw_qt_resized); painter->drawImage(0,0,image2Draw_qt_resized);
//painter->drawImage(0,0,image2Draw_qt_resized);
} }
//only if CV_8UC1 or CV_8UC3 //only if CV_8UC1 or CV_8UC3