From 2722969d0c5ffbcba29142fa0ac7ea2e6ea0f5c1 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 7 Feb 2020 15:51:27 +0000 Subject: [PATCH] Cast void* to JniContext* using static_cast. static_cast is more appropriate than reinrerpret_cast for casting from void* to JniContext*. See Section 7.2.1 (page 173) in The C++ Programming Language, 4th Edition and https://stackoverflow.com/questions/310451/should-i-use-static-cast-or-reinterpret-cast-when-casting-a-void-to-whatever PiperOrigin-RevId: 293812940 --- extensions/av1/src/main/jni/gav1_jni.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc index 4833316f56..6e1f8c75b6 100644 --- a/extensions/av1/src/main/jni/gav1_jni.cc +++ b/extensions/av1/src/main/jni/gav1_jni.cc @@ -403,8 +403,7 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth, return -1; } - JniContext* const context = - reinterpret_cast(callback_private_data); + JniContext* const context = static_cast(callback_private_data); JniFrameBuffer* jni_buffer; context->jni_status_code = context->buffer_manager.GetBuffer( static_cast(y_plane_size), static_cast(uv_plane_size), @@ -443,8 +442,7 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth, void Libgav1ReleaseFrameBuffer(void* callback_private_data, void* buffer_private_data) { - JniContext* const context = - reinterpret_cast(callback_private_data); + JniContext* const context = static_cast(callback_private_data); const int buffer_id = reinterpret_cast(buffer_private_data); context->jni_status_code = context->buffer_manager.ReleaseBuffer(buffer_id); if (context->jni_status_code != kJniStatusOk) {