Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6de42dac authored by Neil Fuller's avatar Neil Fuller
Browse files

Removing some more FloatMath references 

See frameworks/base commit 33253a4b
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I46d4ee4c4be7972e3bcc6782fb50f024b6fff1ee
parent ed583f5e

packages/WallpaperCropper/src/com/android/gallery3d/common/BitmapUtils.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ import android.graphics.Canvas; 
import android.graphics.Matrix;

import android.graphics.Matrix;

import android.graphics.Paint;

import android.graphics.Paint;

import android.os.Build;

import android.os.Build;

import android.util.FloatMath;

import android.util.Log;

import android.util.Log;





import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;
@@ -72,7 +71,7 @@ public class BitmapUtils { 
                && minSideLength == UNCONSTRAINED) return 1;

                && minSideLength == UNCONSTRAINED) return 1;





        int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 1 :

        int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 1 :

                (int) FloatMath.ceil(FloatMath.sqrt((float) (w * h) / maxNumOfPixels));

                (int) Math.ceil(Math.sqrt((double) (w * h) / maxNumOfPixels));





        if (minSideLength == UNCONSTRAINED) {

        if (minSideLength == UNCONSTRAINED) {

            return lowerBound;

            return lowerBound;
@@ -96,7 +95,7 @@ public class BitmapUtils { 




    // Find the min x that 1 / x >= scale

    // Find the min x that 1 / x >= scale

    public static int computeSampleSizeLarger(float scale) {

    public static int computeSampleSizeLarger(float scale) {

        int initialSize = (int) FloatMath.floor(1f / scale);

        int initialSize = (int) Math.floor(1 / scale);

        if (initialSize <= 1) return 1;

        if (initialSize <= 1) return 1;





        return initialSize <= 8

        return initialSize <= 8
@@ -107,7 +106,7 @@ public class BitmapUtils { 
    // Find the max x that 1 / x <= scale.

    // Find the max x that 1 / x <= scale.

    public static int computeSampleSize(float scale) {

    public static int computeSampleSize(float scale) {

        Utils.assertTrue(scale > 0);

        Utils.assertTrue(scale > 0);

        int initialSize = Math.max(1, (int) FloatMath.ceil(1 / scale));

        int initialSize = Math.max(1, (int) Math.ceil(1 / scale));

        return initialSize <= 8

        return initialSize <= 8

                ? Utils.nextPowerOf2(initialSize)

                ? Utils.nextPowerOf2(initialSize)

                : (initialSize + 7) / 8 * 8;

                : (initialSize + 7) / 8 * 8;

core/java/android/gesture/GestureStroke.java

+1 −1

File changed.

Contains only whitespace changes.