Commit 70fb3c64 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

prepend underscore (gdk_pixbuf_get_named_module): prepend underscore

2001-02-18  Havoc Pennington  <hp@pobox.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_load_module): prepend underscore
	(gdk_pixbuf_get_named_module): prepend underscore
	(gdk_pixbuf_get_module): prepend underscore

2001-02-18  Havoc Pennington  <hp@pobox.com>

	* gdk-pixbuf/Makefile.am (IGNORE_HFILES): add gdk-pixbuf-marshal.h

	* gdk-pixbuf/gdk-pixbuf-sections.txt: fixes
parent 6cfbb37f
<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
<SECTION>
<TITLE>Initialization and Versions</TITLE>
<TITLE>Versioning</TITLE>
<FILE>initialization_versions</FILE>
gdk_pixbuf_init
gdk_pixbuf_preinit
gdk_pixbuf_postinit
<SUBSECTION>
gdk_pixbuf_version
......@@ -146,9 +143,9 @@ ModuleUpdatedNotifyFunc
ModuleFrameDoneNotifyFunc
ModuleAnimationDoneNotifyFunc
GdkPixbufModule
gdk_pixbuf_get_module
gdk_pixbuf_get_named_module
gdk_pixbuf_load_module
_gdk_pixbuf_get_module
_gdk_pixbuf_get_named_module
_gdk_pixbuf_load_module
</SECTION>
<SECTION>
......
......@@ -140,14 +140,14 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
return NULL;
}
image_module = gdk_pixbuf_get_module (buffer, size, filename, error);
image_module = _gdk_pixbuf_get_module (buffer, size, filename, error);
if (!image_module) {
fclose (f);
return NULL;
}
if (image_module->module == NULL)
if (!gdk_pixbuf_load_module (image_module, error)) {
if (!_gdk_pixbuf_load_module (image_module, error)) {
fclose (f);
return NULL;
}
......
......@@ -254,8 +254,8 @@ get_libdir (void)
/* reference to the module to load, it doesn't actually load it */
/* perhaps these actions should be combined in one function */
gboolean
gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error)
_gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error)
{
char *module_name;
char *path;
......@@ -338,8 +338,8 @@ m_fill_vtable (xpm);
m_fill_vtable (xbm);
gboolean
gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error)
_gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error)
{
ModuleFillVtableFunc fill_vtable = NULL;
image_module->module = (void *) 1;
......@@ -435,8 +435,8 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GdkPixbufModule *
gdk_pixbuf_get_named_module (const char *name,
GError **error)
_gdk_pixbuf_get_named_module (const char *name,
GError **error)
{
int i;
......@@ -455,9 +455,9 @@ gdk_pixbuf_get_named_module (const char *name,
}
GdkPixbufModule *
gdk_pixbuf_get_module (guchar *buffer, guint size,
const gchar *filename,
GError **error)
_gdk_pixbuf_get_module (guchar *buffer, guint size,
const gchar *filename,
GError **error)
{
int i;
......@@ -530,14 +530,14 @@ gdk_pixbuf_new_from_file (const char *filename,
return NULL;
}
image_module = gdk_pixbuf_get_module (buffer, size, filename, error);
image_module = _gdk_pixbuf_get_module (buffer, size, filename, error);
if (image_module == NULL) {
fclose (f);
return NULL;
}
if (image_module->module == NULL)
if (!gdk_pixbuf_load_module (image_module, error)) {
if (!_gdk_pixbuf_load_module (image_module, error)) {
fclose (f);
return NULL;
}
......@@ -605,7 +605,7 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
GError *error = NULL;
if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL) {
if (!gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], &error)) {
if (!_gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], &error)) {
g_warning ("Error loading XPM image loader: %s", error->message);
g_error_free (error);
return FALSE;
......@@ -671,13 +671,13 @@ gdk_pixbuf_real_save (GdkPixbuf *pixbuf,
{
GdkPixbufModule *image_module = NULL;
image_module = gdk_pixbuf_get_named_module (type, error);
image_module = _gdk_pixbuf_get_named_module (type, error);
if (image_module == NULL)
return FALSE;
if (image_module->module == NULL)
if (!gdk_pixbuf_load_module (image_module, error))
if (!_gdk_pixbuf_load_module (image_module, error))
return FALSE;
if (image_module->save == NULL) {
......
......@@ -87,13 +87,13 @@ struct _GdkPixbufModule {
typedef void (* ModuleFillVtableFunc) (GdkPixbufModule *module);
GdkPixbufModule *gdk_pixbuf_get_module (guchar *buffer, guint size,
const gchar *filename,
GError **error);
GdkPixbufModule *gdk_pixbuf_get_named_module (const char *name,
GError **error);
gboolean gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error);
GdkPixbufModule *_gdk_pixbuf_get_module (guchar *buffer, guint size,
const gchar *filename,
GError **error);
GdkPixbufModule *_gdk_pixbuf_get_named_module (const char *name,
GError **error);
gboolean _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
GError **error);
......
......@@ -316,23 +316,23 @@ gdk_pixbuf_loader_load_module (GdkPixbufLoader *loader,
if (image_type)
{
priv->image_module = gdk_pixbuf_get_named_module (image_type,
error);
priv->image_module = _gdk_pixbuf_get_named_module (image_type,
error);
}
else
{
g_return_val_if_fail (priv->header_buf_offset > 0, 0);
priv->image_module = gdk_pixbuf_get_module (priv->header_buf,
priv->header_buf_offset,
NULL,
error);
priv->image_module = _gdk_pixbuf_get_module (priv->header_buf,
priv->header_buf_offset,
NULL,
error);
}
if (priv->image_module == NULL)
return 0;
if (priv->image_module->module == NULL)
if (!gdk_pixbuf_load_module (priv->image_module, error))
if (!_gdk_pixbuf_load_module (priv->image_module, error))
return 0;
if (priv->image_module->module == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment