From c6c80c37452d0938b1577bd1ad44ad096ca918e0 Mon Sep 17 00:00:00 2001
From: MediaPipe Team <mediapipe-team@google.com>
Date: Tue, 22 Mar 2022 17:24:21 -0700
Subject: [PATCH] Project import generated by Copybara.

GitOrigin-RevId: 17113e259b160929c49262e7aa78ac22d228f9fc
---
 .github/bot_config.yml             | 2 +-
 mediapipe/framework/api2/tag.h     | 2 +-
 mediapipe/gpu/gpu_buffer.h         | 2 ++
 mediapipe/gpu/gpu_buffer_storage.h | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/bot_config.yml b/.github/bot_config.yml
index b1b2d98ea..8ad724168 100644
--- a/.github/bot_config.yml
+++ b/.github/bot_config.yml
@@ -15,4 +15,4 @@
 
 # A list of assignees
 assignees:
-   - sgowroji
+   - sureshdagooglecom
diff --git a/mediapipe/framework/api2/tag.h b/mediapipe/framework/api2/tag.h
index bfe2c7609..898d26c5a 100644
--- a/mediapipe/framework/api2/tag.h
+++ b/mediapipe/framework/api2/tag.h
@@ -61,7 +61,7 @@ constexpr auto tag_build(S) {
 #define MPP_TAG(s)                                      \
   ([] {                                                 \
     struct S {                                          \
-      const const_str tag{s};                           \
+      const ::mediapipe::api2::const_str tag{s};        \
     };                                                  \
     return ::mediapipe::api2::internal::tag_build(S()); \
   }())
diff --git a/mediapipe/gpu/gpu_buffer.h b/mediapipe/gpu/gpu_buffer.h
index 352ffe1e9..47f334a24 100644
--- a/mediapipe/gpu/gpu_buffer.h
+++ b/mediapipe/gpu/gpu_buffer.h
@@ -74,6 +74,7 @@ class GpuBuffer {
     storages_.push_back(std::move(storage));
   }
 
+#if !MEDIAPIPE_DISABLE_GPU && MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
   // This is used to support backward-compatible construction of GpuBuffer from
   // some platform-specific types without having to make those types visible in
   // this header.
@@ -81,6 +82,7 @@ class GpuBuffer {
                          std::declval<T>()))>>
   explicit GpuBuffer(T&& storage_convertible)
       : GpuBuffer(internal::AsGpuBufferStorage(storage_convertible)) {}
+#endif  // !MEDIAPIPE_DISABLE_GPU && MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
 
   int width() const { return current_storage().width(); }
   int height() const { return current_storage().height(); }
diff --git a/mediapipe/gpu/gpu_buffer_storage.h b/mediapipe/gpu/gpu_buffer_storage.h
index e8ad3f367..059448683 100644
--- a/mediapipe/gpu/gpu_buffer_storage.h
+++ b/mediapipe/gpu/gpu_buffer_storage.h
@@ -189,11 +189,13 @@ class GpuBufferStorageImpl : public GpuBufferStorage, public U... {
   using RequireStatics = ForceStaticInstantiation<&registration>;
 };
 
+#if !MEDIAPIPE_DISABLE_GPU && MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
 // This function can be overridden to enable construction of a GpuBuffer from
 // platform-specific types without having to expose that type in the GpuBuffer
 // definition. It is only needed for backward compatibility reasons; do not add
 // overrides for new types.
 std::shared_ptr<internal::GpuBufferStorage> AsGpuBufferStorage();
+#endif  // !MEDIAPIPE_DISABLE_GPU && MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
 
 }  // namespace internal
 }  // namespace mediapipe