Merge remote-tracking branch 'upstream/master' into bookmarkMovie

bogovicj · bogovicj · commit 0a6d41ea55a0 · 2018-10-26T16:53:09.000-04:00
diff --git a/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java b/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
@@ -365,7 +365,7 @@ protected synchronized boolean checkResize()
 	{
 		final int componentW = display.getWidth();
 		final int componentH = display.getHeight();
-		if ( screenImages[ 0 ][ 0 ] == null || screenImages[ 0 ][ 0 ].dimension( 0 ) * screenScales[ 0 ] != componentW || screenImages[ 0 ][ 0 ].dimension( 1 )  * screenScales[ 0 ] != componentH )
+		if ( screenImages[ 0 ][ 0 ] == null || screenImages[ 0 ][ 0 ].dimension( 0 ) != ( int ) ( componentW * screenScales[ 0 ] ) || screenImages[ 0 ][ 0 ].dimension( 1 ) != ( int ) ( componentH  * screenScales[ 0 ] ) )
 		{
 			renderIdQueue.clear();
 			renderIdQueue.addAll( Arrays.asList( 0, 1, 2 ) );

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ protected synchronized boolean checkResize()`
`365`	`365`	`{`
`366`	`366`	`final int componentW = display.getWidth();`
`367`	`367`	`final int componentH = display.getHeight();`
`368`		`- if ( screenImages[ 0 ][ 0 ] == null \|\| screenImages[ 0 ][ 0 ].dimension( 0 ) * screenScales[ 0 ] != componentW \|\| screenImages[ 0 ][ 0 ].dimension( 1 ) * screenScales[ 0 ] != componentH )`
	`368`	`+ if ( screenImages[ 0 ][ 0 ] == null \|\| screenImages[ 0 ][ 0 ].dimension( 0 ) != ( int ) ( componentW * screenScales[ 0 ] ) \|\| screenImages[ 0 ][ 0 ].dimension( 1 ) != ( int ) ( componentH * screenScales[ 0 ] ) )`
`369`	`369`	`{`
`370`	`370`	`renderIdQueue.clear();`
`371`	`371`	`renderIdQueue.addAll( Arrays.asList( 0, 1, 2 ) );`