diff options
| author | Alexander Larsson <alexl@redhat.com> | 2013-09-05 19:30:23 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2013-09-05 19:30:23 +0200 |
| commit | 854f5818f8d7b97ead2af62bc474a59396082dd8 (patch) | |
| tree | 30316554802ae45e596fa93b13283df95254d310 /gtk/gtkcssimage.c | |
| parent | a13d5aefc39c1432e89ead343e886a9a0af293fb (diff) | |
| download | gtk+-854f5818f8d7b97ead2af62bc474a59396082dd8.tar.gz | |
Sync with changes in the cairo device-scale handling
The version of device scale that landed in upstream cairo
master already inherits the device scale in cairo_create_similar,
so no need to do that in gtk anymore.
Diffstat (limited to 'gtk/gtkcssimage.c')
| -rw-r--r-- | gtk/gtkcssimage.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c index 33c85f2abf..042086b1f0 100644 --- a/gtk/gtkcssimage.c +++ b/gtk/gtkcssimage.c @@ -398,20 +398,10 @@ _gtk_css_image_get_surface (GtkCssImage *image, if (target) { -#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE - cairo_surface_get_device_scale (target, &sx, &sy); -#else - sx = sy = 1; -#endif - result = cairo_surface_create_similar (target, CAIRO_CONTENT_COLOR_ALPHA, - surface_width*sx, - surface_height*sy); - -#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE - cairo_surface_set_device_scale (result, sx, sy); -#endif + surface_width, + surface_height); } else result = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, |