isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-22 04:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update/clean and apply the async-texture patch from bug #1144

Browse Source
This commit is contained in:
Chris Lord
2009-01-07 17:02:43 +00:00
parent df3667dd3a
commit 0866b07f30
5 changed files with 110 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/cogl-bitmap.c
View File

@ -148,3 +148,34 @@ _cogl_bitmap_copy_subregion (CoglBitmap *src,
dstdata += dst->rowstride;
}
}
CoglBitmap *
cogl_bitmap_new_from_file (const gchar *filename,
GError **error)
{
CoglBitmap bmp;
g_return_val_if_fail (error == NULL || *error == NULL, COGL_INVALID_HANDLE);
/* Try loading with imaging backend */
if (!_cogl_bitmap_from_file (&bmp, filename, error))
{
/* Try fallback */
if (!_cogl_bitmap_fallback_from_file (&bmp, filename))
return NULL;
else if (error && *error)
{
g_error_free (*error);
*error = NULL;
}
}
return (CoglBitmap *) g_memdup (&bmp, sizeof (CoglBitmap));
}
void
cogl_bitmap_free (CoglBitmap *bmp)
{
g_free (bmp->data);
g_free (bmp);
}