corrected PR errors

keras-team · Dec 8, 2019 · 9022959 · 9022959
1 parent c7749af
commit 9022959
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/keras_preprocessing/image/dataframe_iterator.py b/keras_preprocessing/image/dataframe_iterator.py
@@ -109,6 +109,7 @@ def __init__(self,
                  save_format='png',
                  subset=None,
                  interpolation='nearest',
+                 resizing_function=None,
                  dtype='float32',
                  validate_filenames=True):
 
@@ -120,7 +121,8 @@ def __init__(self,
                                                             save_prefix,
                                                             save_format,
                                                             subset,
-                                                            interpolation)
+                                                            interpolation,
+                                                            resizing_function)
         df = dataframe.copy()
         self.directory = directory or ''
         self.class_mode = class_mode

diff --git a/keras_preprocessing/image/iterator.py b/keras_preprocessing/image/iterator.py
@@ -241,7 +241,8 @@ def _get_batches_of_transformed_samples(self, index_array):
             x = img_to_array(img, data_format=self.data_format)
             # NOTE: we could potentially have keyword arguments for the
             # resizing function
-            x = self.resizing_function(x)
+            if self.resizing_function is not None:
+                x = self.resizing_function(x)
             if x.shape != self.image_shape:
                 raise ValueError(
                     'The loaded image shape %s (at %s) does not correspond to'