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

Commit a1963e42 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Fix static analyzer warnings." am: 9c69c41b am: 4cfb0f02 am: 6ab25ba5 

am: cf1a558a

Change-Id: I4e2608df649dfd3384aadd1f69d88ffc69bf7ea9
parents e3fb0afa cf1a558a

media/mca/filterfw/jni/jni_gl_environment.cpp

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ class NativeWindowHandle : public WindowHandle { 
};



jboolean Java_android_filterfw_core_GLEnvironment_nativeAllocate(JNIEnv* env, jobject thiz) {

  return ToJBool(WrapObjectInJava(new GLEnv(), env, thiz, true));

  std::unique_ptr<GLEnv> glEnv(new GLEnv());

  return ToJBool(WrapOwnedObjectInJava(std::move(glEnv), env, thiz, true));

}



jboolean Java_android_filterfw_core_GLEnvironment_nativeDeallocate(JNIEnv* env, jobject thiz) {

media/mca/filterfw/jni/jni_gl_frame.cpp

+12 −20
Original line number Diff line number Diff line
@@ -48,13 +48,11 @@ jboolean Java_android_filterfw_core_GLFrame_nativeAllocate(JNIEnv* env, 
                                                           jint height) {

  GLEnv* gl_env_ptr = ConvertFromJava<GLEnv>(env, gl_env);

  if (!gl_env_ptr) return JNI_FALSE;

  GLFrame* frame = new GLFrame(gl_env_ptr);

  std::unique_ptr<GLFrame> frame(new GLFrame(gl_env_ptr));

  if (frame->Init(width, height)) {

    return ToJBool(WrapObjectInJava(frame, env, thiz, true));

  } else {

    delete frame;

    return JNI_FALSE;

    return ToJBool(WrapOwnedObjectInJava(std::move(frame), env, thiz, true));

  }

  return JNI_FALSE;

}



jboolean Java_android_filterfw_core_GLFrame_nativeAllocateWithTexture(JNIEnv* env,
@@ -65,13 +63,11 @@ jboolean Java_android_filterfw_core_GLFrame_nativeAllocateWithTexture(JNIEnv* en 
                                                                      jint height) {

  GLEnv* gl_env_ptr = ConvertFromJava<GLEnv>(env, gl_env);

  if (!gl_env_ptr) return JNI_FALSE;

  GLFrame* frame = new GLFrame(gl_env_ptr);

  std::unique_ptr<GLFrame> frame(new GLFrame(gl_env_ptr));

  if (frame->InitWithTexture(tex_id, width, height)) {

    return ToJBool(WrapObjectInJava(frame, env, thiz, true));

  } else {

    delete frame;

    return JNI_FALSE;

    return ToJBool(WrapOwnedObjectInJava(std::move(frame), env, thiz, true));

  }

  return JNI_FALSE;

}



jboolean Java_android_filterfw_core_GLFrame_nativeAllocateWithFbo(JNIEnv* env,
@@ -82,13 +78,11 @@ jboolean Java_android_filterfw_core_GLFrame_nativeAllocateWithFbo(JNIEnv* env, 
                                                                  jint height) {

  GLEnv* gl_env_ptr = ConvertFromJava<GLEnv>(env, gl_env);

  if (!gl_env_ptr) return JNI_FALSE;

  GLFrame* frame = new GLFrame(gl_env_ptr);

  std::unique_ptr<GLFrame> frame(new GLFrame(gl_env_ptr));

  if (frame->InitWithFbo(fbo_id, width, height)) {

    return ToJBool(WrapObjectInJava(frame, env, thiz, true));

  } else {

    delete frame;

    return JNI_FALSE;

    return ToJBool(WrapOwnedObjectInJava(std::move(frame), env, thiz, true));

  }

  return JNI_FALSE;

}



jboolean Java_android_filterfw_core_GLFrame_nativeAllocateExternal(JNIEnv* env,
@@ -96,13 +90,11 @@ jboolean Java_android_filterfw_core_GLFrame_nativeAllocateExternal(JNIEnv* env, 
                                                                   jobject gl_env) {

  GLEnv* gl_env_ptr = ConvertFromJava<GLEnv>(env, gl_env);

  if (!gl_env_ptr) return JNI_FALSE;

  GLFrame* frame = new GLFrame(gl_env_ptr);

  std::unique_ptr<GLFrame> frame(new GLFrame(gl_env_ptr));

  if (frame->InitWithExternalTexture()) {

    return ToJBool(WrapObjectInJava(frame, env, thiz, true));

  } else {

    delete frame;

    return JNI_FALSE;

    return ToJBool(WrapOwnedObjectInJava(std::move(frame), env, thiz, true));

  }

  return JNI_FALSE;

}



jboolean Java_android_filterfw_core_GLFrame_nativeDeallocate(JNIEnv* env, jobject thiz) {

media/mca/filterfw/jni/jni_native_frame.cpp

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ typedef union { 
jboolean Java_android_filterfw_core_NativeFrame_nativeAllocate(JNIEnv* env,

                                                               jobject thiz,

                                                               jint size) {

  return ToJBool(WrapObjectInJava(new NativeFrame(size), env, thiz, true));

  std::unique_ptr<NativeFrame> frame(new NativeFrame(size));

  return ToJBool(WrapOwnedObjectInJava(std::move(frame), env, thiz, true));

}



jboolean Java_android_filterfw_core_NativeFrame_nativeDeallocate(JNIEnv* env, jobject thiz) {

media/mca/filterfw/jni/jni_native_program.cpp

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ using android::filterfw::NativeFrame; 
using android::filterfw::NativeProgram;



jboolean Java_android_filterfw_core_NativeProgram_allocate(JNIEnv* env, jobject thiz) {

  return ToJBool(WrapObjectInJava(new NativeProgram(), env, thiz, true));

  std::unique_ptr<NativeProgram> program(new NativeProgram());

  return ToJBool(WrapOwnedObjectInJava(std::move(program), env, thiz, true));

}



jboolean Java_android_filterfw_core_NativeProgram_deallocate(JNIEnv* env, jobject thiz) {

media/mca/filterfw/jni/jni_shader_program.cpp

+7 −14
Original line number Diff line number Diff line
@@ -46,21 +46,14 @@ jboolean Java_android_filterfw_core_ShaderProgram_allocate(JNIEnv* env, 
  // Create the shader

  if (!fragment_shader || !gl_env_ptr)

    return false;

  else if (!vertex_shader)

    return ToJBool(WrapObjectInJava(new ShaderProgram(

      gl_env_ptr,

      ToCppString(env, fragment_shader)),

      env,

      thiz,

      true));



  std::unique_ptr<ShaderProgram> shader;

  if (!vertex_shader)

    shader.reset(new ShaderProgram(gl_env_ptr, ToCppString(env, fragment_shader)));

  else

    return ToJBool(WrapObjectInJava(new ShaderProgram(

      gl_env_ptr,

      ToCppString(env, vertex_shader),

      ToCppString(env, fragment_shader)),

      env,

      thiz,

      true));

    shader.reset(new ShaderProgram(gl_env_ptr, ToCppString(env, vertex_shader),

                                   ToCppString(env, fragment_shader)));

  return ToJBool(WrapOwnedObjectInJava(std::move(shader), env, thiz, true));

}



jboolean Java_android_filterfw_core_ShaderProgram_deallocate(JNIEnv* env, jobject thiz) {