Commit 0bcf5647 authored by Michael Zucchi's avatar Michael Zucchi Committed by Michael Zucci

Filled in body of function. (rgbconvert): Added GdkColormap parameter, and

1999-12-09  Michael Zucchi  <zucchi@zedzone.mmc.com.au>

	* gdk-pixbuf/gdk-pixbuf-drawable.c (gdk_pixbuf_get_from_drawable):
	Filled in body of function.
	(rgbconvert): Added GdkColormap parameter, and to all conversion
	functions also.

	* gdk-pixbuf/Makefile.am: Re-enabled building of
	textpixbuf-drawable.

	* gdk-pixbuf/testpixbuf-drawable.c (main): Changed to use
	gdk_pixbuf_get_from_drawable().
parent 8dad1ab1
...@@ -38,8 +38,7 @@ libexec_LTLIBRARIES = \ ...@@ -38,8 +38,7 @@ libexec_LTLIBRARIES = \
$(PNM_LIB) \ $(PNM_LIB) \
$(BMP_LIB) $(BMP_LIB)
#noinst_PROGRAMS = testpixbuf testpixbuf-drawable noinst_PROGRAMS = testpixbuf testpixbuf-drawable
noinst_PROGRAMS = testpixbuf
DEPS = libgdk_pixbuf.la DEPS = libgdk_pixbuf.la
INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS) INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
...@@ -49,10 +48,10 @@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS) ...@@ -49,10 +48,10 @@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
if INSIDE_GNOME_LIBS if INSIDE_GNOME_LIBS
testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
#testpixbuf_drawable_LDADD = $(LDADDS) testpixbuf_drawable_LDADD = $(LDADDS)
else else
testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
#testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS) testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
endif endif
GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS) GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
......
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