Merge changes from github.

Change: 138143557

3 files changed, 5 insertions, 4 deletions

diff --git a/tensorflow/contrib/pi_examples/camera/Makefile b/tensorflow/contrib/pi_examples/camera/Makefile
index d7dd3e131f..182baefcd6 100644
--- a/tensorflow/contrib/pi_examples/camera/Makefile
+++ b/tensorflow/contrib/pi_examples/camera/Makefile
@@ -39,7 +39,7 @@ INCLUDES := \
 -I/usr/local/include \
 -I. \
 -I$(DOWNLOADSDIR) \
--I$(DOWNLOADSDIR)/eigen-latest/ \
+-I$(DOWNLOADSDIR)/eigen/ \
 -I$(PROTOGENDIR) \
 -I$(PBTGENDIR)
 LIBS := \
diff --git a/tensorflow/contrib/pi_examples/label_image/Makefile b/tensorflow/contrib/pi_examples/label_image/Makefile
index 511da285a9..0cf71bd294 100644
--- a/tensorflow/contrib/pi_examples/label_image/Makefile
+++ b/tensorflow/contrib/pi_examples/label_image/Makefile
@@ -39,7 +39,7 @@ INCLUDES := \
 -I/usr/local/include \
 -I. \
 -I$(DOWNLOADSDIR) \
--I$(DOWNLOADSDIR)/eigen-latest/ \
+-I$(DOWNLOADSDIR)/eigen/ \
 -I$(PROTOGENDIR) \
 -I$(PBTGENDIR)
 LIBS := \
diff --git a/tensorflow/contrib/pi_examples/label_image/label_image.cc b/tensorflow/contrib/pi_examples/label_image/label_image.cc
index ab19398ef2..04ca134ff4 100644
--- a/tensorflow/contrib/pi_examples/label_image/label_image.cc
+++ b/tensorflow/contrib/pi_examples/label_image/label_image.cc
@@ -23,6 +23,7 @@ limitations under the License.
 //
 // Full build instructions are at tensorflow/contrib/pi_examples/README.md.
 
+#include <stdio.h>
 #include <jpeglib.h>
 #include <setjmp.h>
 #include <fstream>
@@ -315,7 +316,7 @@ int main(int argc, char* argv[]) {
   string output_layer = "softmax";
   bool self_test = false;
   string root_dir = "";
-  vector tensorflow::Flag > flag_list = {
+  std::vector<tensorflow::Flag> flag_list = {
       Flag("image", &image, "image to be processed"),
       Flag("graph", &graph, "graph to be executed"),
       Flag("labels", &labels, "name of file containing labels"),
@@ -338,7 +339,7 @@ int main(int argc, char* argv[]) {
   }
 
   // We need to call this to set up global state for TensorFlow.
-  tensorflow::port::InitMain(usage, &argc, &argv);
+  tensorflow::port::InitMain(usage.c_str(), &argc, &argv);
   if (argc > 1) {
     LOG(ERROR) << "Unknown argument " << argv[1] << "\n" << usage;
     return -1;