blob: 1a33716a26d3fa432fe50445cbe31d665b7aa6da (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From 533b61186f2b1ba71dba63167093a8e7ca45efbd Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Wed, 17 Nov 2010 17:45:27 +0000
Subject: [PATCH] cogl_read_pixels: Fix the format used in GLES2
When converting the data in cogl_read_pixels it was using bmp_format
instead of the format passed in to the function. bmp_format is the
same as the passed in format except that it always has the premult bit
set. Therefore the conversion would not handle premultiply correctly.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
---
clutter/cogl/cogl/cogl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
index 67827f3..a2a4109 100644
--- a/clutter/cogl/cogl/cogl.c
+++ b/clutter/cogl/cogl/cogl.c
@@ -655,7 +655,7 @@ _cogl_read_pixels_full (int x,
allocating its own buffer so we have to copy the data
again */
if ((dst_bmp = _cogl_bitmap_convert_format_and_premult (tmp_bmp,
- bmp_format)))
+ format)))
{
_cogl_bitmap_copy_subregion (dst_bmp,
bmp,
--
1.7.3.16.g9464b
|
GitWeb
