From a818bf24fa1c8fcbd3aed266c550e52fe633b06f Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Thu, 18 Feb 2016 09:05:17 +0100
Subject: [PATCH] [fix] individual images can override global settings, not the
 other way around

---
 prosopopee/prosopopee.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index c9d0a65..6400687 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -30,8 +30,8 @@ class Image(object):
         # assuming string
         if not isinstance(options, dict):
             options = {"name": options}
-        self.options = options.copy()  # used for caching, if it's modified -> regenerate
-        self.options.update(SETTINGS["gm"])
+        self.options = SETTINGS["gm"].copy()  # used for caching, if it's modified -> regenerate
+        self.options.update(options)
 
     @property
     def name(self):