commit 3140901fe829059270bfe62d9ab4712c770e7e75
author Kevin Lubick <kjlubick@google.com> Tue Jan 17 17:56:47 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 17:56:47 2023 +0000
tree fad5d89eb509901684e8074a84fefc53fc567ef5
parent 0dc70726889629342a9d7be092c1efd2ba5c5ae0
parent bab0bb371f1f838e9eee78221c969e83da2d1368

Merge "Remove usage of SK_MaxS32"

libs/hwui/jni/BitmapFactory.cpp

diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index 320d332..c98b87a 100644
--- a/libs/hwui/jni/BitmapFactory.cpp
+++ b/libs/hwui/jni/BitmapFactory.cpp
@@ -34,6 +34,7 @@
 #include <fcntl.h>
 #include <memory>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/stat.h>
 
 jfieldID gOptions_justBoundsFieldID;
@@ -142,7 +143,7 @@
         }
 
         const size_t size = info.computeByteSize(bitmap->rowBytes());
-        if (size > SK_MaxS32) {
+        if (size > INT32_MAX) {
             ALOGW("bitmap is too large");
             return false;
         }