brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/image: Drop ClutterImageError

Browse Source 
Error can be delegated to Cogl now.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2355>
This commit is contained in:
Georges Basile Stavracas Neto 2022-03-31 13:16:53 -03:00
parent f1ac534cd2
commit ca19109ac6
2 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
clutter/clutter/clutter-image.c
View File

@ -62,12 +62,6 @@ G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
clutter_content_iface_init)) clutter_content_iface_init))
GQuark
clutter_image_error_quark (void)
{
return g_quark_from_static_string ("clutter-image-error-quark");
}
static CoglTexture * static CoglTexture *
create_texture_from_data (unsigned int width, create_texture_from_data (unsigned int width,
unsigned int height, unsigned int height,
@ -268,15 +262,10 @@ clutter_image_set_data (ClutterImage *image,
pixel_format, pixel_format,
row_stride, row_stride,
data, data,
NULL); error);
if (priv->texture == NULL) if (priv->texture == NULL)
{ return FALSE;
g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
CLUTTER_IMAGE_ERROR_INVALID_DATA,
"Unable to load image data");
return FALSE;
}
clutter_content_invalidate (CLUTTER_CONTENT (image)); clutter_content_invalidate (CLUTTER_CONTENT (image));
update_image_size (image); update_image_size (image);
@ -333,15 +322,10 @@ clutter_image_set_bytes (ClutterImage *image,
pixel_format, pixel_format,
row_stride, row_stride,
g_bytes_get_data (data, NULL), g_bytes_get_data (data, NULL),
NULL); error);
if (priv->texture == NULL) if (priv->texture == NULL)
{ return FALSE;
g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
CLUTTER_IMAGE_ERROR_INVALID_DATA,
"Unable to load image data");
return FALSE;
}
clutter_content_invalidate (CLUTTER_CONTENT (image)); clutter_content_invalidate (CLUTTER_CONTENT (image));
update_image_size (image); update_image_size (image);
@ -401,7 +385,7 @@ clutter_image_set_area (ClutterImage *image,
pixel_format, pixel_format,
row_stride, row_stride,
data, data,
NULL); error);
} }
else else
{ {
@ -424,12 +408,7 @@ clutter_image_set_area (ClutterImage *image,
} }
if (priv->texture == NULL) if (priv->texture == NULL)
{ return FALSE;
g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
CLUTTER_IMAGE_ERROR_INVALID_DATA,
"Unable to load image data");
return FALSE;
}
clutter_content_invalidate (CLUTTER_CONTENT (image)); clutter_content_invalidate (CLUTTER_CONTENT (image));
update_image_size (image); update_image_size (image);

25
clutter/clutter/clutter-image.h
View File

@ -41,33 +41,10 @@ G_BEGIN_DECLS
#define CLUTTER_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_IMAGE)) #define CLUTTER_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_IMAGE))
#define CLUTTER_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_IMAGE, ClutterImageClass)) #define CLUTTER_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_IMAGE, ClutterImageClass))
/**
* CLUTTER_IMAGE_ERROR:
*
* Error domain for the #ClutterImageError enumeration.
*
* Since: 1.10
*/
#define CLUTTER_IMAGE_ERROR (clutter_image_error_quark ())
typedef struct _ClutterImage ClutterImage; typedef struct _ClutterImage ClutterImage;
typedef struct _ClutterImagePrivate ClutterImagePrivate; typedef struct _ClutterImagePrivate ClutterImagePrivate;
typedef struct _ClutterImageClass ClutterImageClass; typedef struct _ClutterImageClass ClutterImageClass;
/**
* ClutterImageError:
* @CLUTTER_IMAGE_ERROR_INVALID_DATA: Invalid data passed to the
* clutter_image_set_data() function.
*
* Error enumeration for #ClutterImage.
*
* Since: 1.10
*/
typedef enum
{
CLUTTER_IMAGE_ERROR_INVALID_DATA
} ClutterImageError;
/** /**
* ClutterImage: * ClutterImage:
* *
@ -101,8 +78,6 @@ struct _ClutterImageClass
gpointer _padding[16]; gpointer _padding[16];
}; };
CLUTTER_EXPORT
GQuark clutter_image_error_quark (void);
CLUTTER_EXPORT CLUTTER_EXPORT
GType clutter_image_get_type (void) G_GNUC_CONST; GType clutter_image_get_type (void) G_GNUC_CONST;