Merge branch 'master' into devel
This commit is contained in:
commit
363f30cd0a
1 file changed
+1
-1
@@ -863,7 +863,7 @@ Void VideoSubWindow::zoomToFactor( Double factor, QPoint center )
|
|||||||
|
|
||||||
Void VideoSubWindow::scaleView( Double scale, QPoint center )
|
Void VideoSubWindow::scaleView( Double scale, QPoint center )
|
||||||
{
|
{
|
||||||
Q_ASSERT( m_cViewArea->image() );
|
Q_ASSERT( !m_cViewArea->image().isNull() );
|
||||||
if( scale != 1.0 )
|
if( scale != 1.0 )
|
||||||
{
|
{
|
||||||
Double usedScale;
|
Double usedScale;
|
||||||
|
|||||||
Reference in new issue
Block a user