From: James Thewlis <jamt9000@gmail.com>
Date: Fri, 23 May 2014 14:59:52 +0000 (+0100)
Subject: Correctly invert the swapping of colour channels
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5fcf030fb2683e7b286b22cde44e3bce2d98229;p=platform%2Fupstream%2Fcaffe.git

Correctly invert the swapping of colour channels

In the 'deprocess' method, get back the image with the original channel order
by inverting the original transform, rather than reversing the tuple which is
incorrect.
---

diff --git a/python/caffe/pycaffe.py b/python/caffe/pycaffe.py
index 537e737..4827300 100644
--- a/python/caffe/pycaffe.py
+++ b/python/caffe/pycaffe.py
@@ -284,7 +284,8 @@ def _Net_deprocess(self, input_name, input_):
         decaf_in += mean
     decaf_in = decaf_in.transpose((1,2,0))
     if channel_order:
-        decaf_in = decaf_in[:, :, channel_order[::-1]]
+        channel_order_inverse = tuple([channel_order.index(i) for i in (0,1,2)])
+        decaf_in = decaf_in[:, :, channel_order_inverse]
     if input_scale:
         decaf_in /= input_scale
     return decaf_in