Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4e26ca9 authored by Mike Reed's avatar Mike Reed Committed by Android Git Automerger
Browse files

am f8190342: am 086d66dc: Merge change Ib5291c02 into eclair-mr2

Merge commit 'f8190342'

* commit 'f8190342':
  first impl for NDK access to bitmaps
parents ecfd7eae f8190342
Loading
Loading
Loading
Loading
+34 −0
Original line number Diff line number Diff line
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

LOCAL_C_INCLUDES += \
	external/skia/include/core \
	frameworks/base/core/jni/android/graphics \
    dalvik/libnativehelper/include/nativehelper

LOCAL_MODULE:= libjnigraphics

include $(BUILD_SHARED_LIBRARY)
+94 −0
Original line number Diff line number Diff line
/*
 * 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 <android/bitmap.h>
#include <GraphicsJNI.h>

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;
}