From 05801b99453159ec2cf76b0a13858c25ed9e2f3c Mon Sep 17 00:00:00 2001
From: MediaPipe Team <mediapipe-team@google.com>
Date: Wed, 5 Apr 2023 01:09:59 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 521981387
---
 .../java/com/google/mediapipe/framework/jni/graph.cc      | 2 +-
 .../google/mediapipe/framework/jni/packet_creator_jni.cc  | 3 ++-
 .../google/mediapipe/framework/jni/packet_getter_jni.cc   | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mediapipe/java/com/google/mediapipe/framework/jni/graph.cc b/mediapipe/java/com/google/mediapipe/framework/jni/graph.cc
index 23bd553a..d565187d 100644
--- a/mediapipe/java/com/google/mediapipe/framework/jni/graph.cc
+++ b/mediapipe/java/com/google/mediapipe/framework/jni/graph.cc
@@ -578,7 +578,7 @@ mediapipe::GpuResources* Graph::GetGpuResources() const {
 }
 #endif  // !MEDIAPIPE_DISABLE_GPU
 
-absl::Status Graph::SetParentGlContext(int64 java_gl_context) {
+absl::Status Graph::SetParentGlContext(int64_t java_gl_context) {
 #if MEDIAPIPE_DISABLE_GPU
   LOG(FATAL) << "GPU support has been disabled in this build!";
 #else
diff --git a/mediapipe/java/com/google/mediapipe/framework/jni/packet_creator_jni.cc b/mediapipe/java/com/google/mediapipe/framework/jni/packet_creator_jni.cc
index 46ea1ce4..f7430e6e 100644
--- a/mediapipe/java/com/google/mediapipe/framework/jni/packet_creator_jni.cc
+++ b/mediapipe/java/com/google/mediapipe/framework/jni/packet_creator_jni.cc
@@ -132,7 +132,8 @@ CreateImageFrameFromByteBuffer(JNIEnv* env, jobject byte_buffer, jint width,
   // code might expect to be able to overwrite the buffer after creating an
   // ImageFrame from it.
   image_frame->CopyPixelData(
-      format, width, height, width_step, static_cast<const uint8*>(buffer_data),
+      format, width, height, width_step,
+      static_cast<const uint8_t*>(buffer_data),
       mediapipe::ImageFrame::kGlDefaultAlignmentBoundary);
 
   return image_frame;
diff --git a/mediapipe/java/com/google/mediapipe/framework/jni/packet_getter_jni.cc b/mediapipe/java/com/google/mediapipe/framework/jni/packet_getter_jni.cc
index d5bd773f..cc273bca 100644
--- a/mediapipe/java/com/google/mediapipe/framework/jni/packet_getter_jni.cc
+++ b/mediapipe/java/com/google/mediapipe/framework/jni/packet_getter_jni.cc
@@ -65,12 +65,12 @@ bool CopyImageDataToByteBuffer(JNIEnv* env, const mediapipe::ImageFrame& image,
 
   switch (image.ByteDepth()) {
     case 1: {
-      uint8* data = static_cast<uint8*>(buffer_data);
+      uint8_t* data = static_cast<uint8_t*>(buffer_data);
       image.CopyToBuffer(data, expected_buffer_size);
       break;
     }
     case 2: {
-      uint16* data = static_cast<uint16*>(buffer_data);
+      uint16_t* data = static_cast<uint16_t*>(buffer_data);
       image.CopyToBuffer(data, expected_buffer_size);
       break;
     }
@@ -503,8 +503,8 @@ JNIEXPORT jbyteArray JNICALL PACKET_GETTER_METHOD(nativeGetAudioData)(
   int offset = 0;
   for (int sample = 0; sample < num_samples; ++sample) {
     for (int channel = 0; channel < num_channels; ++channel) {
-      int16 value =
-          static_cast<int16>(audio_mat(channel, sample) * kMultiplier);
+      int16_t value =
+          static_cast<int16_t>(audio_mat(channel, sample) * kMultiplier);
       // The java and native has the same byte order, by default is little
       // Endian, we can safely copy data directly, we have tests to cover
       // this.