Skip to content

Fix BitmapFactory inSampleSize logic #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JakeWharton merged 1 commit into from
Jul 15, 2014
Merged

Fix BitmapFactory inSampleSize logic #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions picasso/src/main/java/com/squareup/picasso/BitmapHunter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ static void calculateInSampleSize(int reqWidth, int reqHeight, int width, int he
BitmapFactory.Options options) {
int sampleSize = 1;
if (height > reqHeight || width > reqWidth) {
final int heightRatio = Math.round((float) height / (float) reqHeight);
final int widthRatio = Math.round((float) width / (float) reqWidth);
final int heightRatio = (int) Math.floor((float) height / (float) reqHeight);
final int widthRatio = (int) Math.floor((float) width / (float) reqWidth);
sampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
}
options.inSampleSize = sampleSize;
Expand Down
7 changes: 7 additions & 0 deletions picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

import static android.graphics.Bitmap.Config.ARGB_8888;
import static android.graphics.Bitmap.Config.RGB_565;
import static com.squareup.picasso.BitmapHunter.calculateInSampleSize;
import static com.squareup.picasso.BitmapHunter.createBitmapOptions;
import static com.squareup.picasso.BitmapHunter.forRequest;
import static com.squareup.picasso.BitmapHunter.requiresInSampleSize;
Expand Down Expand Up @@ -388,6 +389,12 @@ public class BitmapHunterTest {
assertThat(requiresInSampleSize(justBounds)).isTrue();
}

@Test public void calculateInSampleSizeNoResize() {
final BitmapFactory.Options options = new BitmapFactory.Options();
calculateInSampleSize(100, 100, 150, 150, options);
assertThat(options.inSampleSize).isEqualTo(1);
}

@Test public void nullBitmapOptionsIfNoResizing() {
// No resize must return no bitmap options
final Request noResize = new Request.Builder(URI_1).build();
Expand Down