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

Commit eba8254c authored by Andrew Hsieh's avatar Andrew Hsieh
Browse files

Fix typo 

Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
parent 2331b423

media/mca/filterfw/jni/jni_gl_frame.cpp

+4 −4
Original line number Diff line number Diff line
@@ -221,10 +221,10 @@ jboolean Java_android_filterfw_core_GLFrame_setNativeBitmap(JNIEnv* env, 
  if (frame && bitmap) {

    uint8_t* pixels;

    const int result = AndroidBitmap_lockPixels(env, bitmap, reinterpret_cast<void**>(&pixels));

    if (result == ANDROID_BITMAP_RESUT_SUCCESS) {

    if (result == ANDROID_BITMAP_RESULT_SUCCESS) {

      const bool success = frame->WriteData(pixels, size);

      return ToJBool(success &&

                     AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESUT_SUCCESS);

                     AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESULT_SUCCESS);

    }

  }

  return JNI_FALSE;
@@ -237,9 +237,9 @@ jboolean Java_android_filterfw_core_GLFrame_getNativeBitmap(JNIEnv* env, 
  if (frame && bitmap) {

    uint8_t* pixels;

    const int result = AndroidBitmap_lockPixels(env, bitmap, reinterpret_cast<void**>(&pixels));

    if (result == ANDROID_BITMAP_RESUT_SUCCESS) {

    if (result == ANDROID_BITMAP_RESULT_SUCCESS) {

      frame->CopyDataTo(pixels, frame->Size());

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESUT_SUCCESS);

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESULT_SUCCESS);

    }

  }

  return JNI_FALSE;

media/mca/filterfw/jni/jni_native_frame.cpp

+4 −4
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ jboolean Java_android_filterfw_core_NativeFrame_setNativeBitmap(JNIEnv* env, 


    Pixel* src_ptr;

    const int result = AndroidBitmap_lockPixels(env, bitmap, reinterpret_cast<void**>(&src_ptr));

    if (result == ANDROID_BITMAP_RESUT_SUCCESS) {

    if (result == ANDROID_BITMAP_RESULT_SUCCESS) {

      // Create destination pointers

      uint8_t* dst_ptr = reinterpret_cast<uint8_t*>(frame->MutableData());

      const uint8_t* end_ptr = dst_ptr + frame->Size();
@@ -207,7 +207,7 @@ jboolean Java_android_filterfw_core_NativeFrame_setNativeBitmap(JNIEnv* env, 
          ALOGE("Unsupported bytes-per-pixel %d in setBitmap!", bytes_per_sample);

          break;

      }

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESUT_SUCCESS);

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESULT_SUCCESS);

    }

  }

  return JNI_FALSE;
@@ -222,7 +222,7 @@ jboolean Java_android_filterfw_core_NativeFrame_getNativeBitmap(JNIEnv* env, 
  if (frame && bitmap) {

    Pixel* dst_ptr;

    const int result = AndroidBitmap_lockPixels(env, bitmap, reinterpret_cast<void**>(&dst_ptr));

    if (result == ANDROID_BITMAP_RESUT_SUCCESS) {

    if (result == ANDROID_BITMAP_RESULT_SUCCESS) {

      // Make sure frame size matches bitmap size

      if ((size / 4) != (frame->Size() / bytes_per_sample)) {

        ALOGE("Size mismatch in native getBitmap()!");
@@ -259,7 +259,7 @@ jboolean Java_android_filterfw_core_NativeFrame_getNativeBitmap(JNIEnv* env, 
          ALOGE("Unsupported bytes-per-pixel %d in getBitmap!", bytes_per_sample);

          break;

      }

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESUT_SUCCESS);

      return (AndroidBitmap_unlockPixels(env, bitmap) == ANDROID_BITMAP_RESULT_SUCCESS);

    }

  }

  return JNI_FALSE;

native/graphics/jni/bitmap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, 
                break;

        }

    }

    return ANDROID_BITMAP_RESUT_SUCCESS;

    return ANDROID_BITMAP_RESULT_SUCCESS;

}



int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) {
@@ -75,7 +75,7 @@ int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) { 
    if (addrPtr) {

        *addrPtr = addr;

    }

    return ANDROID_BITMAP_RESUT_SUCCESS;

    return ANDROID_BITMAP_RESULT_SUCCESS;

}



int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap) {
@@ -95,6 +95,6 @@ int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap) { 
    bm->notifyPixelsChanged();



    bm->unlockPixels();

    return ANDROID_BITMAP_RESUT_SUCCESS;

    return ANDROID_BITMAP_RESULT_SUCCESS;

}