New upstream version 7.8.1upstream/7.8.1

1 files changed, 5 insertions, 3 deletions

diff --git a/nikola/plugins/task/scale_images.py b/nikola/plugins/task/scale_images.py
index e55dc6c..2b483ae 100644
--- a/nikola/plugins/task/scale_images.py
+++ b/nikola/plugins/task/scale_images.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2014-2015 Pelle Nilsson and others.
+# Copyright © 2014-2016 Pelle Nilsson and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -71,8 +71,8 @@ class ScaleImage(Task, ImageProcessor):
 
     def process_image(self, src, dst, thumb):
         """Resize an image."""
-        self.resize_image(src, dst, self.kw['max_image_size'], False)
-        self.resize_image(src, thumb, self.kw['image_thumbnail_size'], False)
+        self.resize_image(src, dst, self.kw['max_image_size'], False, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])
+        self.resize_image(src, thumb, self.kw['image_thumbnail_size'], False, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])
 
     def gen_tasks(self):
         """Copy static files into the output folder."""
@@ -82,6 +82,8 @@ class ScaleImage(Task, ImageProcessor):
             'image_folders': self.site.config['IMAGE_FOLDERS'],
             'output_folder': self.site.config['OUTPUT_FOLDER'],
             'filters': self.site.config['FILTERS'],
+            'preserve_exif_data': self.site.config['PRESERVE_EXIF_DATA'],
+            'exif_whitelist': self.site.config['EXIF_WHITELIST'],
         }
 
         self.image_ext_list = self.image_ext_list_builtin