From fecb40a0433e6c069a27f6120506c105e747e2f7 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Thu, 22 Jul 2010 19:15:44 +0100
Subject: [PATCH] cogl-bitmap-pixbuf: Fix the rowstride used when copying a
GdkPixbuf
In commit b780413e5ae4b the GdkPixbuf loading code was changed so that
if it needs to copy the pixbuf then it would tightly pack it. However
it was still using the rowstride from the pixbuf so the image would
end up skewed. This fixes it to use the real rowstride.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2235
---
cogl/cogl-bitmap-pixbuf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c
index 559574fc3..d85701673 100644
--- a/cogl/cogl-bitmap-pixbuf.c
+++ b/cogl/cogl-bitmap-pixbuf.c
@@ -278,7 +278,7 @@ _cogl_bitmap_from_file (const char *filename,
pixel_format,
width,
height,
- rowstride,
+ n_channels * width,
(CoglBitmapDestroyNotify) g_free,
NULL);
}