diff --git a/include/android/bitmap.h b/include/android/bitmap.h deleted file mode 100644 index 5078277b5..000000000 --- a/include/android/bitmap.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_BITMAP_H -#define ANDROID_BITMAP_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define ANDROID_BITMAP_RESUT_SUCCESS 0 -#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1 -#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2 -#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3 - -enum AndroidBitmapFormat { - ANDROID_BITMAP_FORMAT_NONE = 0, - ANDROID_BITMAP_FORMAT_RGBA_8888 = 1, - ANDROID_BITMAP_FORMAT_RGB_565 = 4, - ANDROID_BITMAP_FORMAT_RGBA_4444 = 7, - ANDROID_BITMAP_FORMAT_A_8 = 8, -}; - -typedef struct { - uint32_t width; - uint32_t height; - uint32_t stride; - int32_t format; - uint32_t flags; // 0 for now -} AndroidBitmapInfo; - -/** - * Given a java bitmap object, fill out the AndroidBitmap struct for it. - * If the call fails, the info parameter will be ignored - */ -int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, - AndroidBitmapInfo* info); - -/** - * Given a java bitmap object, attempt to lock the pixel address. - * Locking will ensure that the memory for the pixels will not move - * until the unlockPixels call, and ensure that, if the pixels had been - * previously purged, they will have been restored. - * - * If this call succeeds, it must be balanced by a call to - * AndroidBitmap_unlockPixels, after which time the address of the pixels should - * no longer be used. - * - * If this succeeds, *addrPtr will be set to the pixel address. If the call - * fails, addrPtr will be ignored. - */ -int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr); - -/** - * Call this to balanace a successful call to AndroidBitmap_lockPixels - */ -int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/libjnigraphics/Android.mk b/libjnigraphics/Android.mk deleted file mode 100644 index 9458f282c..000000000 --- a/libjnigraphics/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -BASE_PATH := $(call my-dir) -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_PRELINK_MODULE := false - -# setup for skia optimizations -# -ifneq ($(ARCH_ARM_HAVE_VFP),true) - LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT -endif - -ifeq ($(ARCH_ARM_HAVE_NEON),true) - LOCAL_CFLAGS += -D__ARM_HAVE_NEON -endif - -# our source files -# -LOCAL_SRC_FILES:= \ - bitmap.cpp - -LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ - libskia - -LOCAL_C_INCLUDES += \ - external/skia/include/core \ - frameworks/base/core/jni/android/graphics \ - dalvik/libnativehelper/include/nativehelper - -LOCAL_MODULE:= libjnigraphics - -include $(BUILD_SHARED_LIBRARY) - diff --git a/libjnigraphics/bitmap.cpp b/libjnigraphics/bitmap.cpp deleted file mode 100644 index fd73430bf..000000000 --- a/libjnigraphics/bitmap.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, - AndroidBitmapInfo* info) { - if (NULL == env || NULL == jbitmap) { - return ANDROID_BITMAP_RESULT_BAD_PARAMETER; - } - - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); - if (NULL == bm) { - return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; - } - - if (info) { - info->width = bm->width(); - info->height = bm->height(); - info->stride = bm->rowBytes(); - info->flags = 0; - - switch (bm->config()) { - case SkBitmap::kARGB_8888_Config: - info->format = ANDROID_BITMAP_FORMAT_RGBA_8888; - break; - case SkBitmap::kRGB_565_Config: - info->format = ANDROID_BITMAP_FORMAT_RGB_565; - break; - case SkBitmap::kARGB_4444_Config: - info->format = ANDROID_BITMAP_FORMAT_RGBA_4444; - break; - case SkBitmap::kA8_Config: - info->format = ANDROID_BITMAP_FORMAT_A_8; - break; - default: - info->format = ANDROID_BITMAP_FORMAT_NONE; - break; - } - } - return ANDROID_BITMAP_RESUT_SUCCESS; -} - -int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) { - if (NULL == env || NULL == jbitmap) { - return ANDROID_BITMAP_RESULT_BAD_PARAMETER; - } - - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); - if (NULL == bm) { - return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; - } - - bm->lockPixels(); - void* addr = bm->getPixels(); - if (NULL == addr) { - bm->unlockPixels(); - return ANDROID_BITMAP_RESULT_ALLOCATION_FAILED; - } - - if (addrPtr) { - *addrPtr = addr; - } - return ANDROID_BITMAP_RESUT_SUCCESS; -} - -int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap) { - if (NULL == env || NULL == jbitmap) { - return ANDROID_BITMAP_RESULT_BAD_PARAMETER; - } - - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); - if (NULL == bm) { - return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; - } - - bm->unlockPixels(); - return ANDROID_BITMAP_RESUT_SUCCESS; -} -