AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert "gdk_pixbuf_get_from_window: honor device scale"

Browse Source 
This reverts commit 657a43e54e.

The commit breaks the assumptions about the arguments in both
gdk_pixbuf_get_from_window() and gdk_pixbuf_get_from_surface().

https://bugzilla.gnome.org/show_bug.cgi?id=757147
This commit is contained in:
Benjamin Otte 2015-11-29 04:49:20 +01:00
parent 9a1913dfb0
commit d210ed7871
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gdk/gdkpixbuf-drawable.c
View File

@ -47,8 +47,8 @@
* @window: Source window * @window: Source window
* @src_x: Source X coordinate within @window * @src_x: Source X coordinate within @window
* @src_y: Source Y coordinate within @window * @src_y: Source Y coordinate within @window
* @width: Width in logical pixels of region to get * @width: Width in pixels of region to get
* @height: Height in logical pixels of region to get * @height: Height in pixels of region to get
* *
* Transfers image data from a #GdkWindow and converts it to an RGB(A) * Transfers image data from a #GdkWindow and converts it to an RGB(A)
* representation inside a #GdkPixbuf. In other words, copies * representation inside a #GdkPixbuf. In other words, copies
@ -88,13 +88,10 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
{ {
cairo_surface_t *surface; cairo_surface_t *surface;
GdkPixbuf *dest; GdkPixbuf *dest;
gint scale;
g_return_val_if_fail (GDK_IS_WINDOW (src), NULL); g_return_val_if_fail (GDK_IS_WINDOW (src), NULL);
g_return_val_if_fail (gdk_window_is_viewable (src), NULL); g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
scale = gdk_window_get_scale_factor (src);
surface = _gdk_window_ref_cairo_surface (src); surface = _gdk_window_ref_cairo_surface (src);
/* We do not know what happened to this surface outside of GDK. /* We do not know what happened to this surface outside of GDK.
@ -105,8 +102,8 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
cairo_surface_mark_dirty (surface); cairo_surface_mark_dirty (surface);
dest = gdk_pixbuf_get_from_surface (surface, dest = gdk_pixbuf_get_from_surface (surface,
scale * src_x, scale * src_y, src_x, src_y,
scale * width, scale * height); width, height);
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
return dest; return dest;
@ -137,16 +134,11 @@ gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
{ {
cairo_surface_t *copy; cairo_surface_t *copy;
cairo_t *cr; cairo_t *cr;
double sx, sy;
cairo_surface_get_device_scale (surface, &sx, &sy);
copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
width, width,
height); height);
cairo_surface_set_device_scale (copy, sx, sy);
cr = cairo_create (copy); cr = cairo_create (copy);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_surface (cr, surface, -src_x, -src_y); cairo_set_source_surface (cr, surface, -src_x, -src_y);