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

Commit aec09b6b authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android (Google) Code Review
Browse files

Merge "Call SkBitmap::config() instead of ::getConfig()"

parents c3c4d36d 4b9a19a8

cmds/bootanimation/BootAnimation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets, 
    glGenTextures(1, &texture->name);

    glBindTexture(GL_TEXTURE_2D, texture->name);



    switch (bitmap.getConfig()) {

    switch (bitmap.config()) {

        case SkBitmap::kA8_Config:

            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_ALPHA,

                    GL_UNSIGNED_BYTE, p);
@@ -181,7 +181,7 @@ status_t BootAnimation::initTexture(void* buffer, size_t len) 
    if (tw < w) tw <<= 1;

    if (th < h) th <<= 1;



    switch (bitmap.getConfig()) {

    switch (bitmap.config()) {

        case SkBitmap::kARGB_8888_Config:

            if (tw != w || th != h) {

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject, 
    p->writeInt32(bitmap->rowBytes());

    p->writeInt32(density);



    if (bitmap->getConfig() == SkBitmap::kIndex8_Config) {

    if (bitmap->config() == SkBitmap::kIndex8_Config) {

        SkColorTable* ctable = bitmap->getColorTable();

        if (ctable != NULL) {

            int count = ctable->count();

core/jni/android/graphics/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public: 
    virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) {

        // accounts for scale in final allocation, using eventual size and config

        const int bytesPerPixel = SkBitmap::ComputeBytesPerPixel(

                configForScaledOutput(bitmap->getConfig()));

                configForScaledOutput(bitmap->config()));

        const int requestedSize = bytesPerPixel *

                int(bitmap->width() * mScale + 0.5f) *

                int(bitmap->height() * mScale + 0.5f);

core/jni/android/graphics/NinePatchImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <utils/Log.h>



static bool getColor(const SkBitmap& bitmap, int x, int y, SkColor* c) {

    switch (bitmap.getConfig()) {

    switch (bitmap.config()) {

        case SkBitmap::kARGB_8888_Config:

            *c = SkUnPreMultiply::PMColorToColor(*bitmap.getAddr32(x, y));

            break;

core/jni/android/opengl/util.cpp

+4 −4
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static jint util_getInternalFormat(JNIEnv *env, jclass clazz, 
    SkBitmap const * nativeBitmap =

            (SkBitmap const *)env->GetIntField(jbitmap, nativeBitmapID);

    const SkBitmap& bitmap(*nativeBitmap);

    SkBitmap::Config config = bitmap.getConfig();

    SkBitmap::Config config = bitmap.config();

    return getInternalFormat(config);

}
@@ -642,7 +642,7 @@ static jint util_getType(JNIEnv *env, jclass clazz, 
    SkBitmap const * nativeBitmap =

            (SkBitmap const *)env->GetIntField(jbitmap, nativeBitmapID);

    const SkBitmap& bitmap(*nativeBitmap);

    SkBitmap::Config config = bitmap.getConfig();

    SkBitmap::Config config = bitmap.config();

    return getType(config);

}
@@ -653,7 +653,7 @@ static jint util_texImage2D(JNIEnv *env, jclass clazz, 
    SkBitmap const * nativeBitmap =

            (SkBitmap const *)env->GetIntField(jbitmap, nativeBitmapID);

    const SkBitmap& bitmap(*nativeBitmap);

    SkBitmap::Config config = bitmap.getConfig();

    SkBitmap::Config config = bitmap.config();

    if (internalformat < 0) {

        internalformat = getInternalFormat(config);

    }
@@ -702,7 +702,7 @@ static jint util_texSubImage2D(JNIEnv *env, jclass clazz, 
    SkBitmap const * nativeBitmap =

            (SkBitmap const *)env->GetIntField(jbitmap, nativeBitmapID);

    const SkBitmap& bitmap(*nativeBitmap);

    SkBitmap::Config config = bitmap.getConfig();

    SkBitmap::Config config = bitmap.config();

    if (format < 0) {

        format = getInternalFormat(config);

        if (format == GL_PALETTE8_RGBA8_OES)