]> Pileus Git - ~andy/gtk/commit
Import the GDI+ gdk-pixbuf loaders for Windows by Dominic Lachowicz and
authorTor Lillqvist <tml@novell.com>
Thu, 20 Mar 2008 23:24:45 +0000 (23:24 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Thu, 20 Mar 2008 23:24:45 +0000 (23:24 +0000)
commit6d15bbbe1da2a30a2bf4b519cd03bf3bc80ccfaf
tree7f865e3e03fc46190ca21516069defda81150860
parent84fa2c6194c90ddaa05c353ab75fe89750f47677
Import the GDI+ gdk-pixbuf loaders for Windows by Dominic Lachowicz and

2008-03-21  Tor Lillqvist  <tml@novell.com>

Import the GDI+ gdk-pixbuf loaders for Windows by Dominic
Lachowicz and Alberto Ruiz into the GTK+ tree, from the
gdip-pixbuf-loader module.

* configure.in: Add switch --disable-gdiplus-loaders that disables
building of the GDI+ loaders.

When including loaders in the gdk-pixbuf library, either build in
abll the GDI+ ones or none of them. Use just -DINCLUDE_gdiplus in
$INCLUDED_LOADER_DEFINE to signal building them in.

Add Automake conditionals BUILD_GDIPLUS_LOADERS to indicate
whether the GDI+ loaders should be built and INCLUDE_GDIPLUS to
indicate whether they should be built-in.

For the rest of the changes, see gdk-pixbuf/ChangeLog.

In gdk-pixbuf:

* Makefile.am: Add the bits and pieces for the GDI+ loaders. When
building GDI+ loaders don't build the traditional ones for the
same formats. Always build the traditional PNG loader, though, as
it isn't possible to read and write PNG tEXt chunks through GDI+,
and GIMP at least needs that functionality in the gdk-pixbuf PNG
loader.

Either build all the GDI+ loaders (except the PNG one) into
libgdk-pixbuf, or build them all as DLLs. I don't see any reason
to enable cherry-picking among them whether to build in or not.

* io-gdip-animation.c
* io-gdip-animation.h
* io-gdip-bmp.c
* io-gdip-emf.c
* io-gdip-gif.c
* io-gdip-ico.c
* io-gdip-jpeg.c
* io-gdip-native.h
* io-gdip-png.c
* io-gdip-propertytags.h
* io-gdip-tiff.c
* io-gdip-utils.c
* io-gdip-utils.h
* io-gdip-wmf.c: New files. Note that io-gdip-png.c is not
currently used.

* gdk-pixbuf-io.c: Add the bits and pieces for built-in GDI+
loaders.

svn path=/trunk/; revision=19914
19 files changed:
ChangeLog
configure.in
gdk-pixbuf/ChangeLog
gdk-pixbuf/Makefile.am
gdk-pixbuf/gdk-pixbuf-io.c
gdk-pixbuf/io-gdip-animation.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-animation.h [new file with mode: 0644]
gdk-pixbuf/io-gdip-bmp.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-emf.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-gif.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-ico.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-jpeg.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-native.h [new file with mode: 0644]
gdk-pixbuf/io-gdip-png.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-propertytags.h [new file with mode: 0644]
gdk-pixbuf/io-gdip-tiff.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-utils.c [new file with mode: 0644]
gdk-pixbuf/io-gdip-utils.h [new file with mode: 0644]
gdk-pixbuf/io-gdip-wmf.c [new file with mode: 0644]