Changed the rcParam option name from 'vector_graphics.combine_images' to 'image.combine_images', and updated the matplotlibrc.template.

breedlun · breedlun · commit 7114ad0ae827 · 2015-02-20T23:23:13.000-07:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1582,11 +1582,7 @@ def option_combine_images(self):
         return whether to combine multiple images on a set of axes into one
         image
         """
-<<<<<<< HEAD
         return rcParams['image.combine_images']
-=======
-        return rcParams['vector_backends.combine_images']
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
 
     def draw_image(self, gc, x, y, im, dx=None, dy=None, transform=None):
         self.check_gc(gc)
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -457,11 +457,7 @@ def option_combine_images(self):
         return whether to combine multiple images on a set of axes into one 
         image
         """
-<<<<<<< HEAD
         return rcParams['image.combine_images']
-=======
-        return rcParams['vector_backends.combine_images']
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
 
     def _get_image_h_w_bits_command(self, im):
         if im.is_grayscale:
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -535,11 +535,7 @@ def option_combine_images(self):
         if rcParams['svg.image_noscale']:
             return False
         else:
-<<<<<<< HEAD
             return rcParams['image.combine_images']
-=======
-            return rcParams['vector_backends.combine_images']
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
 
     def _convert_path(self, path, transform=None, clip=None, simplify=None):
         if clip:
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -758,12 +758,7 @@ def __call__(self, s):
     # Maintain shell focus for TkAgg
     'tk.window_focus':  [False, validate_bool],
     'tk.pythoninspect': [False, validate_tkpythoninspect],  # obsolete
-    
-<<<<<<< HEAD
-=======
-    # combine all images on a set of axes into a single image
-    'vector_backends.combine_images': [True, validate_bool],
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
+
     # Set the papersize/type
     'ps.papersize':     ['letter', validate_ps_papersize],
     'ps.useafm':        [False, validate_bool],  # Set PYTHONINSPECT
