Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mac OS X Backend: Removing clip that is no longer needed #1562

Merged
merged 1 commit into from Dec 9, 2012
Merged

Mac OS X Backend: Removing clip that is no longer needed #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/matplotlib/backends/backend_macosx.py
View file
Open in desktop
Expand Up @@ -107,8 +107,7 @@ def draw_gouraud_triangle(self, gc, points, colors, transform):
def draw_image(self, gc, x, y, im):
im.flipud_out()
nrows, ncols, data = im.as_rgba_str()
gc.draw_image(x, y, nrows, ncols, data, gc.get_clip_rectangle(),
*gc.get_clip_path())
gc.draw_image(x, y, nrows, ncols, data)
im.flipud_out()

def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
Expand Down
88 changes: 6 additions & 82 deletions src/_macosx.m
View file
Open in desktop
Expand Up @@ -1157,43 +1157,6 @@ static int _get_snap(GraphicsContext* self, enum e_snap_mode* mode)
return Py_None;
}

static BOOL _clip(CGContextRef cr, PyObject* object)
{
if (object == Py_None) return true;

PyArrayObject* array = NULL;
array = (PyArrayObject*) PyArray_FromObject(object, PyArray_DOUBLE, 2, 2);
if (!array)
{
PyErr_SetString(PyExc_ValueError, "failed to read clipping bounding box");
return false;
}

if (PyArray_NDIM(array)!=2 || PyArray_DIM(array, 0)!=2 || PyArray_DIM(array, 1)!=2)
{
Py_DECREF(array);
PyErr_SetString(PyExc_ValueError, "clipping bounding box should be a 2x2 array");
return false;
}

const double l = *(double*)PyArray_GETPTR2(array, 0, 0);
const double b = *(double*)PyArray_GETPTR2(array, 0, 1);
const double r = *(double*)PyArray_GETPTR2(array, 1, 0);
const double t = *(double*)PyArray_GETPTR2(array, 1, 1);

Py_DECREF(array);

CGRect rect;
rect.origin.x = (CGFloat) l;
rect.origin.y = (CGFloat) b;
rect.size.width = (CGFloat) (r-l);
rect.size.height = (CGFloat) (t-b);

CGContextClipToRect(cr, rect);

return true;
}

static int _transformation_converter(PyObject* object, void* pointer)
{
CGAffineTransform* matrix = (CGAffineTransform*)pointer;
Expand Down Expand Up @@ -3038,9 +3001,6 @@ static void _data_provider_release(void* info, const void* data, size_t size)
const char* data;
int n;
PyObject* image;
PyObject* cliprect;
PyObject* clippath;
PyObject* clippath_transform;

CGContextRef cr = self->cr;
if (!cr)
Expand All @@ -3049,18 +3009,14 @@ static void _data_provider_release(void* info, const void* data, size_t size)
return NULL;
}

if(!PyArg_ParseTuple(args, "ffiiOOOO", &x,
&y,
&nrows,
&ncols,
&image,
&cliprect,
&clippath,
&clippath_transform)) return NULL;
if(!PyArg_ParseTuple(args, "ffiiO", &x,
&y,
&nrows,
&ncols,
&image)) return NULL;

CGColorSpaceRef colorspace;
CGDataProviderRef provider;
double rect[4] = {0.0, 0.0, self->size.width, self->size.height};

if (!PyBytes_Check(image))
{
Expand Down Expand Up @@ -3118,40 +3074,8 @@ static void _data_provider_release(void* info, const void* data, size_t size)
return NULL;
}

BOOL ok = true;
CGContextSaveGState(cr);
if (!_clip(cr, cliprect)) ok = false;
else if (clippath!=Py_None)
{
int n;
void* iterator = get_path_iterator(clippath,
clippath_transform,
0,
0,
rect,
SNAP_AUTO,
1.0,
0);
if (iterator)
{
n = _draw_path(cr, iterator);
free_path_iterator(iterator);
if (n > 0) CGContextClip(cr);
}
else
{
PyErr_SetString(PyExc_RuntimeError,
"draw_image: failed to obtain path iterator for clipping");
ok = false;
}
}

if (ok) CGContextDrawImage(cr, CGRectMake(x,y,ncols,nrows), bitmap);

CGContextDrawImage(cr, CGRectMake(x,y,ncols,nrows), bitmap);
CGImageRelease(bitmap);
CGContextRestoreGState(cr);

if (!ok) return NULL;

Py_INCREF(Py_None);
return Py_None;
Expand Down