forked from AuroraMiddleware/gtk
829ed02435
2000-04-11 Federico Mena Quintero <federico@helixcode.com> Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com) to make GdkPixbuf's structures opaque and to remove the libart dependency. * gdk-pixbuf/gdk-pixbuf.h: Removed the public structures. (GdkColorspace): New enum that for now only contains GDK_COLORSPACE_RGB. (GdkPixbufDestroyNotify): New type for the pixbuf's pixels destroy notification function. (GdkInterpType): New num with interpolation types. * *.[ch]: Replace the libart stuff with our own stuff. * pixops/*.[ch]: Likewise. * gdk-pixbuf/gdk-pixbuf-private.h: New file with the private declarations of the GdkPixbuf structures. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_new_from_art_pixbuf): Removed function. (gdk_pixbuf_get_format): Constify. (gdk_pixbuf_get_n_channels): Constify. (gdk_pixbuf_get_has_alpha): Constify. (gdk_pixbuf_get_bits_per_sample): Constify. (gdk_pixbuf_get_pixels): Constify. (gdk_pixbuf_get_width): Constify. (gdk_pixbuf_get_height): Constify. (gdk_pixbuf_get_rowstride): Constify. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_copy): New function to copy a pixbuf. * gdk-pixbuf/gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Added a bits_per_sample argument; currently only 8 bits per sample are supported. * gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_pixbuf): New accessor. (gdk_pixbuf_frame_get_x_offset): New accessor. (gdk_pixbuf_frame_get_y_offset): New accessor. (gdk_pixbuf_frame_get_delay_time): New accessor. (gdk_pixbuf_frame_get_action): New accessor. * gdk-pixbuf/gdk-pixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask): Instead of returning a solid mask rectangle for pixbufs without an alpha channel, set the *mask_return to NULL. * gdk-pixbuf/gdk-pixbuf-util.c (gdk_pixbuf_add_alpha): Constify. * gdk-pixbuf/gdk-pixbuf-scale.c: Fix includes. * gdk-pixbuf/gdk-pixbuf-scale.c (gdk_pixbuf_scale): Added some preconditions. Maybe we should also check for the colorspace, bits per pixel, and such. (gdk_pixbuf_composite): Likewise. (gdk_pixbuf_composite_color): Likewise. (gdk_pixbuf_scale_simple): Likewise, and fail gracefully if we cannot allocate the new pixbuf. (gdk_pixbuf_composite_color_simple): Likewise. * gdk-pixbuf/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_render): Use art_rgb_rgba_affine() or art_rgb_affine() since we no longer have an ArtPixBuf. * gdk-pixbuf/io-bmp.c: Fix includes. * gdk-pixbuf/pixops/pixops.c (pixops_scale_nearest): Fixed cast in an lvalue. * TODO: Populated. * configure.in: Removed checks for libart. * gdk-pixbuf/Makefile.am: Removed references to libart. (noinst_HEADERS): Added gdk-pixbuf-private.h. * gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_LDFLAGS): Incremented the version number of the libtool library to indicate that this definitely is not compatible with the old usage. I know you love me. I know you do. * configure.in: Bumped version number to 0.7.0. * README: Updated. * gdk-pixbuf-config.in (--libs): We no longer require libart. * DEPENDS.libgdk_pixbuf: We no longer depend on libart. * gdk-pixbuf.spec.in: Updated, but I don't guarantee anything.
197 lines
3.9 KiB
Makefile
197 lines
3.9 KiB
Makefile
SUBDIRS = pixops
|
|
|
|
if BUILD_CANVAS_ITEM
|
|
CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la
|
|
CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h
|
|
libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c
|
|
EXTRA_GNOME_LIBS = $(GNOME_LIBS)
|
|
else
|
|
CANVAS_PIXBUF_LIB =
|
|
CANVAS_PIXBUF_HEADERFILES =
|
|
EXTRA_GNOME_LIBS =
|
|
endif
|
|
|
|
lib_LTLIBRARIES = \
|
|
libgdk_pixbuf.la \
|
|
$(CANVAS_PIXBUF_LIB)
|
|
|
|
libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS)
|
|
|
|
libexecdir = $(libdir)/gdk-pixbuf/loaders
|
|
|
|
#
|
|
# The PNG plugin.
|
|
#
|
|
libpixbuf_png_la_SOURCES = io-png.c
|
|
libpixbuf_png_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_png_la_LIBADD = $(LIBPNG)
|
|
|
|
#
|
|
# The JPEG loader
|
|
#
|
|
libpixbuf_jpeg_la_SOURCES = io-jpeg.c
|
|
libpixbuf_jpeg_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_jpeg_la_LIBADD = $(LIBJPEG)
|
|
|
|
#
|
|
# The XPM loader
|
|
#
|
|
libpixbuf_xpm_la_SOURCES = io-xpm.c
|
|
libpixbuf_xpm_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_xpm_la_LIBADD =
|
|
|
|
#
|
|
# The GIF loader
|
|
#
|
|
libpixbuf_gif_la_SOURCES = io-gif.c
|
|
libpixbuf_gif_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_gif_la_LIBADD =
|
|
|
|
#
|
|
# The ICO loader
|
|
#
|
|
libpixbuf_ico_la_SOURCES = io-ico.c
|
|
libpixbuf_ico_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_ico_la_LIBADD =
|
|
|
|
#
|
|
# The RAS loader
|
|
#
|
|
libpixbuf_ras_la_SOURCES = io-ras.c
|
|
libpixbuf_ras_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_ras_la_LIBADD =
|
|
|
|
#
|
|
# The TIFF loader
|
|
#
|
|
libpixbuf_tiff_la_SOURCES = io-tiff.c
|
|
libpixbuf_tiff_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_tiff_la_LIBADD = $(LIBTIFF)
|
|
|
|
#
|
|
# The PNM loader
|
|
#
|
|
libpixbuf_pnm_la_SOURCES = io-pnm.c
|
|
libpixbuf_pnm_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_pnm_la_LIBADD =
|
|
|
|
#
|
|
# The BMP loader
|
|
#
|
|
libpixbuf_bmp_la_SOURCES = io-bmp.c
|
|
libpixbuf_bmp_la_LDFLAGS = -avoid-version -module
|
|
libpixbuf_bmp_la_LIBADD =
|
|
|
|
if HAVE_PNG
|
|
PNG_LIB = libpixbuf-png.la
|
|
endif
|
|
|
|
if HAVE_JPEG
|
|
JPEG_LIB = libpixbuf-jpeg.la
|
|
endif
|
|
|
|
GIF_LIB = libpixbuf-gif.la
|
|
|
|
ICO_LIB = libpixbuf-ico.la
|
|
|
|
RAS_LIB = libpixbuf-ras.la
|
|
|
|
if HAVE_TIFF
|
|
TIFF_LIB = libpixbuf-tiff.la
|
|
endif
|
|
|
|
XPM_LIB = libpixbuf-xpm.la
|
|
|
|
PNM_LIB = libpixbuf-pnm.la
|
|
|
|
BMP_LIB = libpixbuf-bmp.la
|
|
|
|
if BUILD_DYNAMIC_MODULES
|
|
|
|
libexec_LTLIBRARIES = \
|
|
$(PNG_LIB) \
|
|
$(JPEG_LIB) \
|
|
$(GIF_LIB) \
|
|
$(ICO_LIB) \
|
|
$(RAS_LIB) \
|
|
$(XPM_LIB) \
|
|
$(TIFF_LIB) \
|
|
$(PNM_LIB) \
|
|
$(BMP_LIB)
|
|
|
|
|
|
extra_sources =
|
|
|
|
else
|
|
libexec_LTLIBRARIES =
|
|
|
|
extra_sources = $(libpixbuf_png_la_SOURCES) \
|
|
$(libpixbuf_jpeg_la_SOURCES) \
|
|
$(libpixbuf_xpm_la_SOURCES) \
|
|
$(libpixbuf_gif_la_SOURCES) \
|
|
$(libpixbuf_ico_la_SOURCES) \
|
|
$(libpixbuf_ras_la_SOURCES) \
|
|
$(libpixbuf_tiff_la_SOURCES) \
|
|
$(libpixbuf_pnm_la_SOURCES) \
|
|
$(libpixbuf_bmp_la_SOURCES)
|
|
|
|
builtin_libraries =
|
|
endif
|
|
|
|
noinst_PROGRAMS = testpixbuf testpixbuf-drawable testanimation testpixbuf-scale
|
|
|
|
DEPS = libgdk_pixbuf.la
|
|
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
|
|
-I$(top_srcdir)/gdk-pixbuf \
|
|
-I$(top_builddir)/gdk-pixbuf \
|
|
$(GLIB_CFLAGS) $(GTK_CFLAGS)
|
|
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
|
|
|
|
LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
if INSIDE_GNOME_LIBS
|
|
testpixbuf_LDADD = $(LDADDS) -lgmodule
|
|
testpixbuf_drawable_LDADD = $(LDADDS)
|
|
testpixbuf_scale_LDADD = $(LDADDS)
|
|
testanimation_LDADD = $(LDADDS) -lgmodule
|
|
else
|
|
testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
|
|
testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
|
|
testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
|
|
testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
|
|
endif
|
|
|
|
|
|
GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
|
|
|
|
#
|
|
# The GdkPixBuf library
|
|
#
|
|
|
|
libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
|
|
|
|
libgdk_pixbuf_la_SOURCES = \
|
|
gdk-pixbuf.c \
|
|
gdk-pixbuf-animation.c \
|
|
gdk-pixbuf-data.c \
|
|
gdk-pixbuf-drawable.c \
|
|
gdk-pixbuf-io.c \
|
|
gdk-pixbuf-loader.c \
|
|
gdk-pixbuf-render.c \
|
|
gdk-pixbuf-scale.c \
|
|
gdk-pixbuf-util.c \
|
|
$(extra_sources)
|
|
|
|
libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 $(GLIB_LIBS) $(GTK_LIBS)
|
|
libgdk_pixbuf_la_LIBADD = pixops/libpixops.la
|
|
|
|
libgdk_pixbufinclude_HEADERS = \
|
|
gdk-pixbuf.h \
|
|
gdk-pixbuf-loader.h \
|
|
gdk-pixbuf-features.h \
|
|
$(CANVAS_PIXBUF_HEADERFILES)
|
|
|
|
noinst_HEADERS = \
|
|
gdk-pixbuf-io.h \
|
|
gdk-pixbuf-private.h
|