[composer] Don't resize picture frame to invalid sizes (sponsored by City of Uster, Switzerland)

nyalldawson · nyalldawson · commit 5c8cd77151f1 · 2014-04-28T20:19:00.000+10:00
diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp
@@ -364,7 +364,7 @@ void QgsComposerPicture::setSceneRect( const QRectF& rectangle )
 
   QRectF newRect = rectangle;
 
-  if ( mResizeMode == ZoomResizeFrame && !rect().isEmpty() )
+  if ( mResizeMode == ZoomResizeFrame && !rect().isEmpty() && !( currentPictureSize.isEmpty() ) )
   {
     //if width has changed less than height, then fix width and set height correspondingly
     //else, do the opposite
@@ -380,8 +380,11 @@ void QgsComposerPicture::setSceneRect( const QRectF& rectangle )
   }
   else if ( mResizeMode == FrameToImageSize )
   {
-    newRect.setWidth( currentPictureSize.width() * 25.4 / mComposition->printResolution() );
-    newRect.setHeight( currentPictureSize.height() * 25.4 / mComposition->printResolution() );
+    if ( !( currentPictureSize.isEmpty() ) )
+    {
+      newRect.setWidth( currentPictureSize.width() * 25.4 / mComposition->printResolution() );
+      newRect.setHeight( currentPictureSize.height() * 25.4 / mComposition->printResolution() );
+    }
   }
 
   //find largest scaling of picture with this rotation which fits in item

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ void QgsComposerPicture::setSceneRect( const QRectF& rectangle )`
`364`	`364`
`365`	`365`	`QRectF newRect = rectangle;`
`366`	`366`
`367`		`- if ( mResizeMode == ZoomResizeFrame && !rect().isEmpty() )`
	`367`	`+ if ( mResizeMode == ZoomResizeFrame && !rect().isEmpty() && !( currentPictureSize.isEmpty() ) )`
`368`	`368`	`{`
`369`	`369`	`//if width has changed less than height, then fix width and set height correspondingly`
`370`	`370`	`//else, do the opposite`
`@@ -380,8 +380,11 @@ void QgsComposerPicture::setSceneRect( const QRectF& rectangle )`
`380`	`380`	`}`
`381`	`381`	`else if ( mResizeMode == FrameToImageSize )`
`382`	`382`	`{`
`383`		`- newRect.setWidth( currentPictureSize.width() * 25.4 / mComposition->printResolution() );`
`384`		`- newRect.setHeight( currentPictureSize.height() * 25.4 / mComposition->printResolution() );`
	`383`	`+ if ( !( currentPictureSize.isEmpty() ) )`
	`384`	`+ {`
	`385`	`+ newRect.setWidth( currentPictureSize.width() * 25.4 / mComposition->printResolution() );`
	`386`	`+ newRect.setHeight( currentPictureSize.height() * 25.4 / mComposition->printResolution() );`
	`387`	`+ }`
`385`	`388`	`}`
`386`	`389`
`387`	`390`	`//find largest scaling of picture with this rotation which fits in item`