diff options
| author | Kweku Adams <kwekua@google.com> | 2020-01-10 17:43:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-10 17:43:13 +0000 |
| commit | d3ce139cb381f603f0089237b83528a81e6d4cca (patch) | |
| tree | 066b923f3b57c550ee5480cfa25cb1e6dbfd3e19 /native | |
| parent | 5927ed17a656e79964e58d1bb2757687782e296e (diff) | |
| parent | 10b2ddc1d28ef694ca1dd923885ac6e609221136 (diff) | |
Merge "Revert "Implement AndroidBitmap_getDataSpace""
Diffstat (limited to 'native')
| -rw-r--r-- | native/graphics/jni/bitmap.cpp | 10 | ||||
| -rw-r--r-- | native/graphics/jni/libjnigraphics.map.txt | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp index 26c7f8d709e7..1aebeaf1e7e8 100644 --- a/native/graphics/jni/bitmap.cpp +++ b/native/graphics/jni/bitmap.cpp @@ -16,7 +16,6 @@ #include <android/bitmap.h> #include <android/graphics/bitmap.h> -#include <android/data_space.h> int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, AndroidBitmapInfo* info) { @@ -30,15 +29,6 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, return ANDROID_BITMAP_RESULT_SUCCESS; } -int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) { - if (NULL == env || NULL == jbitmap) { - return ADATASPACE_UNKNOWN; // Or return a real error? - } - - android::graphics::Bitmap bitmap(env, jbitmap); - return bitmap.getDataSpace(); -} - int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) { if (NULL == env || NULL == jbitmap) { return ANDROID_BITMAP_RESULT_BAD_PARAMETER; diff --git a/native/graphics/jni/libjnigraphics.map.txt b/native/graphics/jni/libjnigraphics.map.txt index 6adb95520d6c..a601d8af2830 100644 --- a/native/graphics/jni/libjnigraphics.map.txt +++ b/native/graphics/jni/libjnigraphics.map.txt @@ -1,7 +1,6 @@ LIBJNIGRAPHICS { global: AndroidBitmap_getInfo; - AndroidBitmap_getDataSpace; AndroidBitmap_lockPixels; AndroidBitmap_unlockPixels; local: |