Merge pull request #2144 from tishibas/load_image-improved

[platform/upstream/caffeonacl.git] / python / caffe / io.py

diff --git a/python/caffe/io.py b/python/caffe/io.py
index 14942be..7531058 100644 (file)
--- a/python/caffe/io.py
+++ b/python/caffe/io.py
@@ -292,7 +292,7 @@ def load_image(filename, color=True):
         of size (H x W x 3) in RGB or
         of size (H x W x 1) in grayscale.
     """
-    img = skimage.img_as_float(skimage.io.imread(filename)).astype(np.float32)
+    img = skimage.img_as_float(skimage.io.imread(filename, as_grey=not color)).astype(np.float32)
     if img.ndim == 2:
         img = img[:, :, np.newaxis]
         if color: