AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Account for alignment when reading xbm data. (#346721, patch by Dave

Browse Source 
2006-07-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkpixmap-quartz.c: (gdk_bitmap_create_from_data):
	Account for alignment when reading xbm data. (#346721, patch
	by Dave Vasilevsky)
This commit is contained in:
Richard Hult 2006-07-10 09:54:21 +00:00 committed by Richard Hult
parent 451543039a
commit 4904b59030
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-10 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkpixmap-quartz.c: (gdk_bitmap_create_from_data):
Account for alignment when reading xbm data. (#346721, patch
by Dave Vasilevsky)
2006-07-09 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkgeometry-quartz.c:

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-07-10 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkpixmap-quartz.c: (gdk_bitmap_create_from_data):
Account for alignment when reading xbm data. (#346721, patch
by Dave Vasilevsky)
2006-07-09 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkgeometry-quartz.c:

18
gdk/quartz/gdkpixmap-quartz.c
View File

@ -201,7 +201,7 @@ gdk_bitmap_create_from_data (GdkDrawable *window,
{
GdkPixmap *pixmap;
GdkPixmapImplQuartz *impl;
int x, y;
int x, y, bpl;
g_return_val_if_fail (data != NULL, NULL);
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
@ -212,19 +212,21 @@ gdk_bitmap_create_from_data (GdkDrawable *window,
g_assert (CGImageGetBytesPerRow (impl->image) == width);
/* Bytes per line: Each line consumes an integer number of bytes, possibly
* ignoring any excess bits. */
bpl = (width + 7) / 8;
for (y = 0; y < height; y++)
{
guchar *ptr = impl->data + y * width;
gint idx;
guchar *dst = impl->data + y * width;
const gchar *src = data + (y * bpl);
for (x = 0; x < width; x++)
{
if ((data[(y * width + x) / 8] >> x % 8) & 1)
*ptr = 0xff;
if ((src[x / 8] >> x % 8) & 1)
*dst = 0xff;
else
*ptr = 0;
*dst = 0;
ptr++;
dst++;
}
}