Skip to content
Browse files

Merge branch 'master' of github.com:wilsaj/enable

  • Loading branch information...
2 parents c6d424b + 47abf85 commit 63ed43a964c4a2386068f3b62837ac235a6efbc9 @wilsaj committed Jul 15, 2011
Showing with 4 additions and 1 deletion.
  1. +1 −1 enable/wx/quartz.py
  2. +3 −0 kiva/quartz/ABCGI.pyx
View
2 enable/wx/quartz.py
@@ -40,7 +40,7 @@ def __init__(self, size_or_array, window_gc=None, *args, **kwds):
@classmethod
def create_from_gc(klass, gc, size_or_array, *args, **kwds):
- return klass(size_or_array, gc, *args, **kwds)
+ return GraphicsContext(size_or_array, gc, *args, **kwds)
class _WindowGraphicsContext(ABCGI.CGContextInABox):
View
3 kiva/quartz/ABCGI.pyx
@@ -1703,6 +1703,9 @@ cdef class CGBitmapContext(CGContext):
mode = 'L'
else:
raise ValueError("cannot save this pixel format")
+
+ if file_format is None:
+ file_format = ''
img = Image.fromstring(mode, (self.width(), self.height()), self)
if 'A' in mode:

0 comments on commit 63ed43a

Please sign in to comment.
Something went wrong with that request. Please try again.