From a513929490fc03eab6cab97b1534dcde9ba14ec9 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Thu, 8 Mar 2018 23:27:19 +0000
Subject: [PATCH] Replace std::array with std::vector to address Mac build
 issues

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 .../core/kernels/draw_bounding_box_op.cc      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/kernels/draw_bounding_box_op.cc b/tensorflow/core/kernels/draw_bounding_box_op.cc
index 13d02a29bb9..c75a394992b 100644
--- a/tensorflow/core/kernels/draw_bounding_box_op.cc
+++ b/tensorflow/core/kernels/draw_bounding_box_op.cc
@@ -52,6 +52,7 @@ class DrawBoundingBoxesOp : public OpKernel {
     const int64 batch_size = images.dim_size(0);
     const int64 height = images.dim_size(1);
     const int64 width = images.dim_size(2);
+    const int64 default_color_table_length = 10;
 
     // 0: yellow
     // 1: blue
@@ -63,12 +64,21 @@ class DrawBoundingBoxesOp : public OpKernel {
     // 7: navy blue
     // 8: aqua
     // 9: fuchsia
-    std::vector<std::array<float, 4>> color_table = {
+    float default_color_table[default_color_table_length][4] = {
         {1, 1, 0, 1},     {0, 0, 1, 1},     {1, 0, 0, 1},   {0, 1, 0, 1},
         {0.5, 0, 0.5, 1}, {0.5, 0.5, 0, 1}, {0.5, 0, 0, 1}, {0, 0, 0.5, 1},
         {0, 1, 1, 1},     {1, 0, 1, 1},
     };
 
+    std::vector<std::vector<float>> color_table;
+    for (int64 i = 0; i < default_color_table_length; i++) {
+      std::vector<float> color_value(4);
+      for (int64 j = 0; j < 4; j++) {
+        color_value[j] = default_color_table[i][j];
+      }
+      color_table.emplace_back(color_value);
+    }
+
     // Reset first color channel to 1 if image is GRY.
     // For GRY images, this means all bounding boxes will be white.
     if (depth == 1) {
@@ -89,8 +99,11 @@ class DrawBoundingBoxesOp : public OpKernel {
 
         auto colors = colors_tensor.matrix<float>();
         for (int64 i = 0; i < colors.dimension(0); i++) {
-          color_table.emplace_back(std::array<float, 4>{
-              colors(i, 0), colors(i, 1), colors(i, 2), colors(i, 3)});
+          std::vector<float> color_value(4);
+          for (int64 j = 0; j < 4; j++) {
+            color_value[j] = colors(i, j);
+          }
+          color_table.emplace_back(color_value);
         }
       }
     }