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

Commit f8627d65 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "framework changes needed to support Skia at r12108."

parents 96a1f90c ed79ff00

core/jni/android/graphics/Bitmap.cpp

+4 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void ToColor_SI8_Alpha(SkColor dst[], const void* src, int width, 
    do {

        *dst++ = SkUnPreMultiply::PMColorToColor(colors[*s++]);

    } while (--width != 0);

    ctable->unlockColors(false);

    ctable->unlockColors();

}



static void ToColor_SI8_Raw(SkColor dst[], const void* src, int width,
@@ -240,7 +240,7 @@ static void ToColor_SI8_Raw(SkColor dst[], const void* src, int width, 
        *dst++ = SkColorSetARGB(SkGetPackedA32(c), SkGetPackedR32(c),

                                SkGetPackedG32(c), SkGetPackedB32(c));

    } while (--width != 0);

    ctable->unlockColors(false);

    ctable->unlockColors();

}



static void ToColor_SI8_Opaque(SkColor dst[], const void* src, int width,
@@ -253,7 +253,7 @@ static void ToColor_SI8_Opaque(SkColor dst[], const void* src, int width, 
        *dst++ = SkColorSetRGB(SkGetPackedR32(c), SkGetPackedG32(c),

                               SkGetPackedB32(c));

    } while (--width != 0);

    ctable->unlockColors(false);

    ctable->unlockColors();

}



// can return NULL
@@ -550,7 +550,7 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject, 
            p->writeInt32(count);

            memcpy(p->writeInplace(count * sizeof(SkPMColor)),

                   ctable->lockColors(), count * sizeof(SkPMColor));

            ctable->unlockColors(false);

            ctable->unlockColors();

        } else {

            p->writeInt32(0);   // indicate no ctable

        }

core/jni/android/graphics/BitmapRegionDecoder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ private: 
    int fHeight;

};



static jobject createBitmapRegionDecoder(JNIEnv* env, SkStream* stream) {

static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream) {

    SkImageDecoder* decoder = SkImageDecoder::Factory(stream);

    int width, height;

    if (NULL == decoder) {
@@ -107,7 +107,7 @@ static jobject nativeNewInstanceFromByteArray(JNIEnv* env, jobject, jbyteArray b 
        For now we just always copy the array's data if isShareable.

     */

    AutoJavaByteArray ar(env, byteArray);

    SkStream* stream = new SkMemoryStream(ar.ptr() + offset, length, true);

    SkMemoryStream* stream = new SkMemoryStream(ar.ptr() + offset, length, true);



    jobject brd = createBitmapRegionDecoder(env, stream);

    SkSafeUnref(stream); // the decoder now holds a reference

core/jni/android/opengl/util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static jint util_texImage2D(JNIEnv *env, jclass clazz, 
            SkColorTable* ctable = bitmap.getColorTable();

            memcpy(data, ctable->lockColors(), ctable->count() * sizeof(SkPMColor));

            memcpy(pixels, p, size);

            ctable->unlockColors(false);

            ctable->unlockColors();

            glCompressedTexImage2D(target, level, internalformat, w, h, border, imageSize, data);

            free(data);

        } else {