summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/graphics/BitmapFactory.java
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2013-12-03 16:26:51 -0500
committerLeon Scroggins III <scroggo@google.com>2014-01-15 11:37:04 -0500
commit8790be6de3644e332ec6a17c855da89ffc13a9bf (patch)
tree45dd6bf1f37585b02335b9ed5e35d35463c2a650 /graphics/java/android/graphics/BitmapFactory.java
parentcae6b43b03d0be44c6e63ed1db5ef835633a3b86 (diff)
downloadframeworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.zip
frameworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.tar.gz
frameworks_base-8790be6de3644e332ec6a17c855da89ffc13a9bf.tar.bz2
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
Diffstat (limited to 'graphics/java/android/graphics/BitmapFactory.java')
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index b714fab..2b69a15 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -153,8 +153,12 @@ public class BitmapFactory {
*
* <p>This does not affect bitmaps without an alpha channel.</p>
*
+ * <p>Setting this flag to false while setting {@link #inScaled} to true
+ * may result in incorrect colors.</p>
+ *
* @see Bitmap#hasAlpha()
* @see Bitmap#isPremultiplied()
+ * @see #inScaled
*/
public boolean inPremultiplied;
@@ -249,6 +253,9 @@ public class BitmapFactory {
* <p>This flag is turned on by default and should be turned off if you need
* a non-scaled version of the bitmap. Nine-patch bitmaps ignore this
* flag and are always scaled.
+ *
+ * <p>If {@link #inPremultiplied} is set to false, and the image has alpha,
+ * setting this flag to true may result in incorrect colors.
*/
public boolean inScaled;