Merge pull request #4 from SimonStefan/master

minimize round-off error
jesperborgstrup · Aug 14, 2015 · a0b63e7 · a0b63e7
2 parents b9df2d5 + 7e1b6dc
commit a0b63e7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/com/buzzingandroid/ui/ViewAspectRatioMeasurer.java b/src/com/buzzingandroid/ui/ViewAspectRatioMeasurer.java
@@ -81,15 +81,15 @@ public void measure(int widthMeasureSpec, int heightMeasureSpec, double aspectRa
 			/*
 			 * Possibility 2: Width dynamic, height fixed
 			 */
-			measuredWidth = (int) Math.min( widthSize, heightSize * aspectRatio );
-			measuredHeight = (int) (measuredWidth / aspectRatio);
+			measuredHeight = (int) Math.min( heightSize, widthSize / aspectRatio );
+			measuredWidth = (int) (measuredHeight * aspectRatio);
 
 		} else if ( widthMode == MeasureSpec.EXACTLY ) {
 			/*
 			 * Possibility 3: Width fixed, height dynamic
 			 */
-			measuredHeight = (int) Math.min( heightSize, widthSize / aspectRatio );
-			measuredWidth = (int) (measuredHeight * aspectRatio);
+			measuredWidth = (int) Math.min( widthSize, heightSize * aspectRatio );
+			measuredHeight = (int) (measuredWidth / aspectRatio);
 
 		} else {
 			/*