Merge branch 'v2.x'

efiring · efiring · commit 6faecee3d35a · 2016-11-22T15:53:08.000-10:00
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -560,10 +560,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
     def _args(self):
         # Returns the command line parameters for subprocess to use
         # ffmpeg to create a movie using a collection of temp images
-        return [self.bin_path(),  # -r option is not needed before -i option
+        return [self.bin_path(), '-r', str(self.fps),
                 '-i', self._base_temp_name(),
-                '-vframes', str(self._frame_counter),
-                '-r', str(self.fps)] + self.output_args
+                '-vframes', str(self._frame_counter)] + self.output_args
 
 
 # Base class of avconv information.  AVConv has identical arguments to
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -193,14 +193,16 @@ def update_from(self, other):
         Updates this :class:`Patch` from the properties of *other*.
         """
         artist.Artist.update_from(self, other)
-        self.set_edgecolor(other.get_edgecolor())
-        self.set_facecolor(other.get_facecolor())
-        self.set_fill(other.get_fill())
-        self.set_hatch(other.get_hatch())
-        self.set_linewidth(other.get_linewidth())
-        self.set_linestyle(other.get_linestyle())
+        # For some properties we don't need or don't want to go through the
+        # getters/setters, so we just copy them directly.
+        self._edgecolor = other._edgecolor
+        self._facecolor = other._facecolor
+        self._fill = other._fill
+        self._hatch = other._hatch
+        self._linewidth = other._linewidth
+        # Use setters, getters where we need the extra work they do.
+        self.set_linestyle(other._linestyle)  # also sets dash properties
         self.set_transform(other.get_data_transform())
-        self.set_alpha(other.get_alpha())
 
     def get_extents(self):
         """
