diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-04-07 18:05:41 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-04-08 11:09:36 +0200 |
| commit | ace31d1c8a5ea88a8eb55568208d6e297e089a81 (patch) | |
| tree | 5b950322f54b1efc39f1c6eb594d43f2a58d7560 /client/x11 | |
| parent | 0fcba8ba40979bf799ab9faabdb44b6f21a7302f (diff) | |
| download | spice-ace31d1c8a5ea88a8eb55568208d6e297e089a81.tar.gz spice-ace31d1c8a5ea88a8eb55568208d6e297e089a81.tar.xz spice-ace31d1c8a5ea88a8eb55568208d6e297e089a81.zip | |
gl: use correct pixman accessor for image data
Commit 774e5bd36f4 changed
- dest->source.pixmap.x_image->data +
+ (uint8_t *)pixman_image_get_stride(dest->source.pixmap.pixman_image) +
The correct accessor to use is pixman_image_get_data. Thanks to gcc
4.6 for warning about a "different size" int to pointer conversion.
Diffstat (limited to 'client/x11')
| -rw-r--r-- | client/x11/red_drawable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp index e7151eda..19dcd92a 100644 --- a/client/x11/red_drawable.cpp +++ b/client/x11/red_drawable.cpp @@ -353,7 +353,7 @@ static inline void copy_to_pixmap_from_gltexture(const RedDrawable_p* dest, while (height > 0) { glReadPixels(src_x, y - height, area.right - area.left, 1, GL_BGRA, GL_UNSIGNED_BYTE, - (uint8_t *)pixman_image_get_stride(dest->source.pixmap.pixman_image) + + (uint8_t *)pixman_image_get_data(dest->source.pixmap.pixman_image) + (area.left + offset.x) * 4 + (area.top + offset.y + height - 1) * pixman_image_get_stride(dest->source.pixmap.pixman_image)); |