Commit b5adee99 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

A loader for PCX files. (#113035, Josh Beam)

2003-05-21  Matthias Clasen  <maclas@gmx.de>

	* pixbufloader_pcx.def:
	* io-pcx.c: A loader for PCX files.  (#113035, Josh Beam)

	* gdk-pixbuf-io.c:
	* Makefile.am: Add PCX loader.
parent ec288c70
......@@ -23,6 +23,8 @@ Tue May 20 21:58:00 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
2003-05-21 Matthias Clasen <maclas@gmx.de>
* configure.in (all_loaders): Add pcx.
* gtk/gtkcalendar.c: Make calendar controls spin. (#112540)
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
......
......@@ -23,6 +23,8 @@ Tue May 20 21:58:00 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
2003-05-21 Matthias Clasen <maclas@gmx.de>
* configure.in (all_loaders): Add pcx.
* gtk/gtkcalendar.c: Make calendar controls spin. (#112540)
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
......
......@@ -23,6 +23,8 @@ Tue May 20 21:58:00 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
2003-05-21 Matthias Clasen <maclas@gmx.de>
* configure.in (all_loaders): Add pcx.
* gtk/gtkcalendar.c: Make calendar controls spin. (#112540)
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
......
......@@ -23,6 +23,8 @@ Tue May 20 21:58:00 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
2003-05-21 Matthias Clasen <maclas@gmx.de>
* configure.in (all_loaders): Add pcx.
* gtk/gtkcalendar.c: Make calendar controls spin. (#112540)
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
......
......@@ -23,6 +23,8 @@ Tue May 20 21:58:00 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
2003-05-21 Matthias Clasen <maclas@gmx.de>
* configure.in (all_loaders): Add pcx.
* gtk/gtkcalendar.c: Make calendar controls spin. (#112540)
Tue May 20 17:27:24 2003 Owen Taylor <otaylor@redhat.com>
......
......@@ -827,7 +827,7 @@ else
fi
fi
all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga"
all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,tga,pcx"
included_loaders=""
# If no loaders specified, include all
if test "x$with_included_loaders" = xyes ; then
......
2003-05-21 Matthias Clasen <maclas@gmx.de>
* pixbufloader_pcx.def:
* io-pcx.c: A loader for PCX files. (#113035, Josh Beam)
* gdk-pixbuf-io.c:
* Makefile.am: Add PCX loader.
2003-05-19 Matthias Clasen <maclas@gmx.de>
Improve progressive loading from slow sources: (#107368)
......
......@@ -150,6 +150,14 @@ libpixbufloader_tga_la_SOURCES = io-tga.c
libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
libpixbufloader_tga_la_LIBADD = $(module_libs)
#
# The PCX loader
#
libpixbufloader_static_pcx_la_SOURCES = io-pcx.c
libpixbufloader_pcx_la_SOURCES = io-pcx.c
libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined)
libpixbufloader_pcx_la_LIBADD = $(module_libs)
if HAVE_PNG
PNG_LIB = libpixbufloader-png.la
STATIC_PNG_LIB = libpixbufloader-static-png.la
......@@ -195,6 +203,9 @@ STATIC_XBM_LIB = libpixbufloader-static-xbm.la
TGA_LIB = libpixbufloader-tga.la
STATIC_TGA_LIB = libpixbufloader-static-tga.la
PCX_LIB = libpixbufloader-pcx.la
STATIC_PCX_LIB = libpixbufloader-static-pcx.la
if BUILD_DYNAMIC_MODULES
loader_LTLIBRARIES = \
......@@ -210,7 +221,8 @@ loader_LTLIBRARIES = \
$(BMP_LIB) \
$(WBMP_LIB) \
$(XBM_LIB) \
$(TGA_LIB)
$(TGA_LIB) \
$(PCX_LIB)
extra_sources =
......@@ -231,7 +243,8 @@ noinst_LTLIBRARIES = \
$(STATIC_BMP_LIB) \
$(STATIC_WBMP_LIB) \
$(STATIC_XBM_LIB) \
$(STATIC_TGA_LIB)
$(STATIC_TGA_LIB) \
$(STATIC_PCX_LIB)
builtin_objs = @INCLUDED_LOADER_OBJ@
......
......@@ -413,6 +413,7 @@ module (tiff);
module (xpm);
module (xbm);
module (tga);
module (pcx);
gboolean
_gdk_pixbuf_load_module (GdkPixbufModule *image_module,
......@@ -518,6 +519,13 @@ _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
}
#endif
#ifdef INCLUDE_pcx
else if (strcmp (image_module->module_name, "pcx") == 0) {
fill_info = MODULE_ENTRY (pcx, fill_info);
fill_vtable = MODULE_ENTRY (pcx, fill_vtable);
}
#endif
if (fill_vtable) {
(* fill_vtable) (image_module);
image_module->info = g_new0 (GdkPixbufFormat, 1);
......@@ -541,7 +549,7 @@ gdk_pixbuf_io_init ()
gchar *included_formats[] = {
"ani", "png", "bmp", "wbmp", "gif",
"ico", "jpeg", "pnm", "ras", "tiff",
"xpm", "xbm", "tga",
"xpm", "xbm", "tga", "pcx",
NULL
};
gchar **name;
......
This diff is collapsed.
EXPORTS
fill_vtable
fill_info
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