mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
f944d419a3
_cogl_bitmap_convert_format_and_premult was failing when converting from RGBA to RGB and vice versa. _cogl_bitmap_fallback_convert converts without altering the premult status so when choosing a new format it would copy over the premult bit. However, it did this regardless of whether the new format had an alpha channel so when converting from RGBA_8888_PRE to RGB_888 it would end up inventing a new meaningless format which would be RGB_888_PRE. This patch makes it avoid copying the premult flag if the destination has no alpha. It doesn't matter if it copies when the source format has no alpha because it will always be unset. _cogl_bitmap_convert_format_and_premult was also breaking when converting from RGBA_8888_PRE to RGB_888 because it would think RGB_888 is unpremultiplied and try to convert but then _cogl_bitmap_fallback_premult wouldn't know how to do the conversion. http://bugzilla.openedhand.com/show_bug.cgi?id=2057
191 lines
5.1 KiB
C
191 lines
5.1 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl.h"
|
|
#include "cogl-internal.h"
|
|
#include "cogl-bitmap-private.h"
|
|
|
|
#include <string.h>
|
|
|
|
static void _cogl_bitmap_free (CoglBitmap *bmp);
|
|
|
|
COGL_HANDLE_DEFINE (Bitmap, bitmap);
|
|
|
|
static void
|
|
_cogl_bitmap_free (CoglBitmap *bmp)
|
|
{
|
|
g_free (bmp->data);
|
|
g_free (bmp);
|
|
}
|
|
|
|
int
|
|
_cogl_get_format_bpp (CoglPixelFormat format)
|
|
{
|
|
int bpp_lut[] = {
|
|
0, /* invalid */
|
|
1, /* A_8 */
|
|
3, /* 888 */
|
|
4, /* 8888 */
|
|
2, /* 565 */
|
|
2, /* 4444 */
|
|
2, /* 5551 */
|
|
2, /* YUV */
|
|
1 /* G_8 */
|
|
};
|
|
|
|
return bpp_lut [format & COGL_UNORDERED_MASK];
|
|
}
|
|
|
|
gboolean
|
|
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
|
|
CoglPixelFormat dst_format)
|
|
{
|
|
/* Do we need to unpremultiply? */
|
|
if ((bmp->format & COGL_PREMULT_BIT) > 0 &&
|
|
(dst_format & COGL_PREMULT_BIT) == 0)
|
|
/* Try unpremultiplying using imaging library */
|
|
return (_cogl_bitmap_unpremult (bmp)
|
|
/* ... or try fallback */
|
|
|| _cogl_bitmap_fallback_unpremult (bmp));
|
|
|
|
/* Do we need to premultiply? */
|
|
if ((bmp->format & COGL_PREMULT_BIT) == 0 &&
|
|
(dst_format & COGL_PREMULT_BIT) > 0)
|
|
/* Try premultiplying using imaging library */
|
|
return (_cogl_bitmap_premult (bmp)
|
|
/* ... or try fallback */
|
|
|| _cogl_bitmap_fallback_premult (bmp));
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
_cogl_bitmap_convert_format_and_premult (const CoglBitmap *bmp,
|
|
CoglBitmap *dst_bmp,
|
|
CoglPixelFormat dst_format)
|
|
{
|
|
/* Is base format different (not considering premult status)? */
|
|
if ((bmp->format & COGL_UNPREMULT_MASK) !=
|
|
(dst_format & COGL_UNPREMULT_MASK))
|
|
{
|
|
/* Try converting using imaging library */
|
|
if (!_cogl_bitmap_convert (bmp, dst_bmp, dst_format))
|
|
{
|
|
/* ... or try fallback */
|
|
if (!_cogl_bitmap_fallback_convert (bmp, dst_bmp, dst_format))
|
|
return FALSE;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Copy the bitmap so that we can premultiply in-place */
|
|
*dst_bmp = *bmp;
|
|
dst_bmp->data = g_memdup (bmp->data, bmp->rowstride * bmp->height);
|
|
}
|
|
|
|
/* We only need to do a premult conversion if both formats have an
|
|
alpha channel. If we're converting from RGB to RGBA then the
|
|
alpha will have been filled with 255 so the premult won't do
|
|
anything or if we are converting from RGBA to RGB we're losing
|
|
information so either converting or not will be wrong for
|
|
transparent pixels */
|
|
if ((dst_bmp->format & COGL_A_BIT) == COGL_A_BIT &&
|
|
(dst_format & COGL_A_BIT) == COGL_A_BIT &&
|
|
!_cogl_bitmap_convert_premult_status (dst_bmp, dst_format))
|
|
{
|
|
g_free (dst_bmp->data);
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
_cogl_bitmap_copy_subregion (CoglBitmap *src,
|
|
CoglBitmap *dst,
|
|
int src_x,
|
|
int src_y,
|
|
int dst_x,
|
|
int dst_y,
|
|
int width,
|
|
int height)
|
|
{
|
|
guint8 *srcdata;
|
|
guint8 *dstdata;
|
|
int bpp;
|
|
int line;
|
|
|
|
/* Intended only for fast copies when format is equal! */
|
|
g_assert (src->format == dst->format);
|
|
bpp = _cogl_get_format_bpp (src->format);
|
|
|
|
srcdata = src->data + src_y * src->rowstride + src_x * bpp;
|
|
dstdata = dst->data + dst_y * dst->rowstride + dst_x * bpp;
|
|
|
|
for (line=0; line<height; ++line)
|
|
{
|
|
memcpy (dstdata, srcdata, width * bpp);
|
|
srcdata += src->rowstride;
|
|
dstdata += dst->rowstride;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
cogl_bitmap_get_size_from_file (const char *filename,
|
|
int *width,
|
|
int *height)
|
|
{
|
|
return _cogl_bitmap_get_size_from_file (filename, width, height);
|
|
}
|
|
|
|
CoglHandle
|
|
cogl_bitmap_new_from_file (const char *filename,
|
|
GError **error)
|
|
{
|
|
CoglBitmap bmp;
|
|
CoglBitmap *ret;
|
|
|
|
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;
|
|
}
|
|
}
|
|
|
|
ret = g_memdup (&bmp, sizeof (CoglBitmap));
|
|
return _cogl_bitmap_handle_new (ret);
|
|
}
|
|
|