From a20015e1e7b656a47fd87d474c08bdaef61b0bae Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 15 Sep 2010 11:09:40 -0600
Subject: [PATCH] Workaround for bug that affects some windows install causing
 white backgrounds on default covers to be rendered as yellow

---
 src/calibre/utils/magick/__init__.py |  2 +-
 src/calibre/utils/magick/draw.py     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/utils/magick/__init__.py b/src/calibre/utils/magick/__init__.py
index 073a030361..2707430c67 100644
--- a/src/calibre/utils/magick/__init__.py
+++ b/src/calibre/utils/magick/__init__.py
@@ -194,7 +194,7 @@ class Image(_magick.Image): # {{{
 
 # }}}
 
-def create_canvas(width, height, bgcolor='white'):
+def create_canvas(width, height, bgcolor='#ffffff'):
     canvas = Image()
     canvas.create_canvas(int(width), int(height), str(bgcolor))
     return canvas
diff --git a/src/calibre/utils/magick/draw.py b/src/calibre/utils/magick/draw.py
index 301bf9912a..ed9e3d3d83 100644
--- a/src/calibre/utils/magick/draw.py
+++ b/src/calibre/utils/magick/draw.py
@@ -11,7 +11,7 @@ from calibre.utils.magick import Image, DrawingWand, create_canvas
 from calibre.constants import __appname__, __version__
 from calibre import fit_image
 
-def save_cover_data_to(data, path, bgcolor='white', resize_to=None,
+def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None,
         return_data=False):
     '''
     Saves image in data to path, in the format specified by the path
@@ -28,7 +28,7 @@ def save_cover_data_to(data, path, bgcolor='white', resize_to=None,
         return canvas.export(os.path.splitext(path)[1][1:])
     canvas.save(path)
 
-def thumbnail(data, width=120, height=120, bgcolor='white', fmt='jpg'):
+def thumbnail(data, width=120, height=120, bgcolor='#ffffff', fmt='jpg'):
     img = Image()
     img.load(data)
     owidth, oheight = img.size
@@ -61,7 +61,7 @@ def identify(path):
     return identify_data(data)
 
 def add_borders_to_image(path_to_image, left=0, top=0, right=0, bottom=0,
-        border_color='white'):
+        border_color='#ffffff'):
     img = Image()
     img.open(path_to_image)
     lwidth, lheight = img.size
@@ -80,7 +80,7 @@ def create_text_wand(font_size, font_path=None):
     ans.text_alias = True
     return ans
 
-def create_text_arc(text, font_size, font=None, bgcolor='white'):
+def create_text_arc(text, font_size, font=None, bgcolor='#ffffff'):
     if isinstance(text, unicode):
         text = text.encode('utf-8')
 
@@ -148,7 +148,7 @@ class TextLine(object):
 
 
 def create_cover_page(top_lines, logo_path, width=590, height=750,
-        bgcolor='white', output_format='jpg'):
+        bgcolor='#ffffff', output_format='jpg'):
     '''
     Create the standard calibre cover page and return it as a byte string in
     the specified output_format.