X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0d6320aa792b7e49b410f5582b84acbce2fc362a..afaa2879d192be067cae523b51dad75d89a6c6cb:/src/com/owncloud/android/utils/BitmapUtils.java?ds=inline diff --git a/src/com/owncloud/android/utils/BitmapUtils.java b/src/com/owncloud/android/utils/BitmapUtils.java index df04a410..7b9382e6 100644 --- a/src/com/owncloud/android/utils/BitmapUtils.java +++ b/src/com/owncloud/android/utils/BitmapUtils.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -30,8 +33,6 @@ import java.io.File; /** * Utility class with methods for decoding Bitmaps. - * - * @author David A. Velasco */ public class BitmapUtils { @@ -94,7 +95,9 @@ public class BitmapUtils { if (height > reqHeight || width > reqWidth) { final int halfHeight = height / 2; final int halfWidth = width / 2; - + + // calculates the largest inSampleSize value (for smallest sample) that is a power of 2 and keeps both + // height and width **larger** than the requested height and width. while ((halfHeight / inSampleSize) > reqHeight && (halfWidth / inSampleSize) > reqWidth) { inSampleSize *= 2; @@ -181,7 +184,7 @@ public class BitmapUtils { */ public static boolean isImage(File file) { Uri selectedUri = Uri.fromFile(file); - String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString()); + String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString().toLowerCase()); String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension); return (mimeType != null && mimeType.startsWith("image/"));