From 21716d8f6e175cd6e8cd97a84e48497574268b0c Mon Sep 17 00:00:00 2001 From: Martin Wicke Date: Mon, 25 Jul 2016 13:48:16 -0800 Subject: Merge changes from github. Change: 128401884 --- tensorflow/examples/label_image/main.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tensorflow/examples/label_image') diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc index e4cc11dbe0..7faf1cef61 100644 --- a/tensorflow/examples/label_image/main.cc +++ b/tensorflow/examples/label_image/main.cc @@ -99,8 +99,10 @@ Status ReadTensorFromImageFile(string file_name, const int input_height, if (tensorflow::StringPiece(file_name).ends_with(".png")) { image_reader = DecodePng(root.WithOpName("png_reader"), file_reader, DecodePng::Channels(wanted_channels)); + } else if (tensorflow::StringPiece(file_name).ends_with(".gif")) { + image_reader = DecodeGif(root.WithOpName("gif_reader"), file_reader); } else { - // Assume if it's not a PNG then it must be a JPEG. + // Assume if it's neither a PNG nor a GIF then it must be a JPEG. image_reader = DecodeJpeg(root.WithOpName("jpeg_reader"), file_reader, DecodeJpeg::Channels(wanted_channels)); } -- cgit v1.2.3