Merge pull request #668 from qingqing01/acc_image_proc

Accelerating image processing for CNN

python/paddle/utils/image_util.py

@@ -186,29 +186,32 @@ class ImageTransformer:
                  channel_swap=None,
                  mean=None,
                  is_color=True):
-        self.transpose = transpose
-        self.channel_swap = None
-        self.mean = None
         self.is_color = is_color
+        self.set_transpose(transpose)
+        self.set_channel_swap(channel_swap)
+        self.set_mean(mean)
 
     def set_transpose(self, order):
-        if self.is_color:
+        if order is not None:
-            assert 3 == len(order)
+            if self.is_color:
+                assert 3 == len(order)
         self.transpose = order
 
     def set_channel_swap(self, order):
-        if self.is_color:
+        if order is not None:
-            assert 3 == len(order)
+            if self.is_color:
+                assert 3 == len(order)
         self.channel_swap = order
 
     def set_mean(self, mean):
-        # mean value, may be one value per channel 
+        if mean is not None:
-        if mean.ndim == 1:
+            # mean value, may be one value per channel 
-            mean = mean[:, np.newaxis, np.newaxis]
+            if mean.ndim == 1:
-        else:
+                mean = mean[:, np.newaxis, np.newaxis]
-            # elementwise mean
+            else:
-            if self.is_color:
+                # elementwise mean
-                assert len(mean.shape) == 3
+                if self.is_color:
+                    assert len(mean.shape) == 3
         self.mean = mean
 
     def transformer(self, data):