AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

#include <config.h>, and fix includes.

Browse Source 
1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	* src/testpixbuf.c: #include <config.h>, and fix includes.

	* src/testpixbuf-drawable.c: #include <config.h>, and fix includes.

	* src/io-xpm.c: Fix includes.

	* src/io-tiff.c: Fix includes.

	* src/io-ras.c: Fix includes, and do not include more stuff than needed.

	* src/io-pnm.c: Fix inlcudes, and do not include more stuff than needed.

	* src/io-png.c: Fix includes.

	* src/io-ico.c: Fix includes, and do not include more stuff than needed.

	* src/io-gif.c: Fix includes, and do not include more stuff than needed.

	* src/io-bmp.c: Fix includes, and do not include more stuff than needed.

	* src/gnome-canvas-pixbuf.c: Fix includes.

	* src/gdk-pixbuf.c: Fix includes.

	* src/gdk-pixbuf-util.c: Fix includes.

	* src/gdk-pixbuf-render.c: Fix includes.

	* src/gdk-pixbuf-io.h: Fix includes.

	* src/gdk-pixbuf-drawable.c: Fix includes.

	* src/gdk-pixbuf-drawable.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/gdk-pixbuf-data.c: Fix includes.

	* src/gdk-pixbuf-loader.c: #include <config.h>

	* src/gdk-pixbuf-loader.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/Makefile.am: Commented out the gdk-pixbuf-drawable stuff,
	since it is not finished.
This commit is contained in:
Federico Mena Quintero 1999-12-02 20:44:43 +00:00 committed by Arturo Espinosa
parent 21f0dff4cd
commit 25a8142429
26 changed files with 96 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demos/testpixbuf-drawable.c
View File

@ -1,7 +1,8 @@
#include <config.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-drawable.h"
void close_app(GtkWidget *widget, gpointer data)
{

8
demos/testpixbuf.c
View File

@ -18,14 +18,14 @@
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf/gdk-pixbuf-loader.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-loader.h"
typedef struct {
FILE *imagefile;

45
gdk-pixbuf/ChangeLog
View File

@ -1,5 +1,50 @@
1999-12-02 Federico Mena Quintero <federico@redhat.com>
* src/testpixbuf.c: #include <config.h>, and fix includes.
* src/testpixbuf-drawable.c: #include <config.h>, and fix includes.
* src/io-xpm.c: Fix includes.
* src/io-tiff.c: Fix includes.
* src/io-ras.c: Fix includes, and do not include more stuff than needed.
* src/io-pnm.c: Fix inlcudes, and do not include more stuff than needed.
* src/io-png.c: Fix includes.
* src/io-ico.c: Fix includes, and do not include more stuff than needed.
* src/io-gif.c: Fix includes, and do not include more stuff than needed.
* src/io-bmp.c: Fix includes, and do not include more stuff than needed.
* src/gnome-canvas-pixbuf.c: Fix includes.
* src/gdk-pixbuf.c: Fix includes.
* src/gdk-pixbuf-util.c: Fix includes.
* src/gdk-pixbuf-render.c: Fix includes.
* src/gdk-pixbuf-io.h: Fix includes.
* src/gdk-pixbuf-drawable.c: Fix includes.
* src/gdk-pixbuf-drawable.h: Use angle brackets for the gdk-pixbuf
include files.
* src/gdk-pixbuf-data.c: Fix includes.
* src/gdk-pixbuf-loader.c: #include <config.h>
* src/gdk-pixbuf-loader.h: Use angle brackets for the gdk-pixbuf
include files.
* src/Makefile.am: Commented out the gdk-pixbuf-drawable stuff,
since it is not finished.
* src/gdk-pixbuf.h: Removed unused transformation prototypes.
* src/gdk-pixbuf-util.c: New file with utility and convenience

11
gdk-pixbuf/Makefile.am
View File

@ -38,7 +38,8 @@ libexec_LTLIBRARIES = \
$(PNM_LIB) \
$(BMP_LIB)
noinst_PROGRAMS = testpixbuf testpixbuf-drawable
#noinst_PROGRAMS = testpixbuf testpixbuf-drawable
noinst_PROGRAMS = testpixbuf
DEPS = libgdk_pixbuf.la
@ -50,7 +51,7 @@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) \
-lgmodule
testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
#testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
@ -73,18 +74,20 @@ libgdk_pixbuf_la_SOURCES = \
gdk-pixbuf-io.c \
gdk-pixbuf-loader.c \
gdk-pixbuf-render.c \
gdk-pixbuf-drawable.c \
gdk-pixbuf-util.c \
$(CANVAS_SOURCEFILES)
# gdk-pixbuf-drawable.c \
libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
libgdk_pixbufinclude_HEADERS = \
gdk-pixbuf.h \
gdk-pixbuf-drawable.h \
gdk-pixbuf-loader.h \
$(CANVAS_HEADERFILES)
# gdk-pixbuf-drawable.h \
noinst_HEADERS = \
gdk-pixbuf-io.h

15
gdk-pixbuf/gdk-pixbuf-cache.h
View File

@ -1,15 +0,0 @@
#ifndef _GDK_PIXBUF_CACHE_H_
#define _GDK_PIXBUF_CACHE_H_
/* The optional cache interface */
typedef struct {
int dummy;
} GdkPixbufCache;
GdkPixbufCache *gdk_pixbuf_cache_new (long image_cache_limit,
long pixmap_bitmap_cache_limit);
void gdk_pixbuf_cache_destroy (GdkPixbufCache *cache);
GdkPixbuf *gdk_pixbuf_cache_load_image (GdkPixbufCache *cache,
const char *file);
#endif

2
gdk-pixbuf/gdk-pixbuf-data.c
View File

@ -21,7 +21,7 @@
*/
#include <config.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"

2
gdk-pixbuf/gdk-pixbuf-drawable.h
View File

@ -2,7 +2,7 @@
#define _GDK_PIXBUF_DRAWABLE_H_
#include <gdk/gdk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
GdkPixbuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
GdkPixbuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);

2
gdk-pixbuf/gdk-pixbuf-io.h
View File

@ -29,7 +29,7 @@
#include <gmodule.h>
#include <stdio.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"
#ifdef __cplusplus
extern "C" {

3
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -25,9 +25,10 @@
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <gtk/gtksignal.h>
#include "gdk-pixbuf-loader.h"
#include "gdk-pixbuf-io.h"
#include <gtk/gtksignal.h>

2
gdk-pixbuf/gdk-pixbuf-loader.h
View File

@ -28,7 +28,7 @@
#include <unistd.h>
#include <gtk/gtkobject.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef __cplusplus
extern "C" {

2
gdk-pixbuf/gdk-pixbuf-util.c
View File

@ -21,7 +21,7 @@
*/
#include <config.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"

2
gdk-pixbuf/gdk-pixbuf.c
View File

@ -29,7 +29,7 @@
#include <libart_lgpl/art_pixbuf.h>
#include <libart_lgpl/art_rgb_pixbuf_affine.h>
#include <libart_lgpl/art_alphagamma.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"

6
gdk-pixbuf/gnome-canvas-pixbuf.c
View File

@ -24,9 +24,9 @@
#include <math.h>
#include <libgnomeui/gnome-canvas.h>
#include <libgnomeui/gnome-canvas-util.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gnome-canvas-pixbuf.h"
#include "libart_lgpl/art_rgb_pixbuf_affine.h"
#include "gdk-pixbuf.h"
#include <libart_lgpl/art_rgb_pixbuf_affine.h>
#include "gnome-canvas-pixbuf.h"

9
gdk-pixbuf/io-bmp.c
View File

@ -34,12 +34,9 @@ Known bugs:
#include <config.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

5
gdk-pixbuf/io-gif.c
View File

@ -60,10 +60,9 @@
#include <config.h>
#include <stdio.h>
#include <glib.h>
#include <string.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

8
gdk-pixbuf/io-ico.c
View File

@ -35,12 +35,8 @@ Known bugs:
#include <config.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

4
gdk-pixbuf/io-jpeg.c
View File

@ -47,8 +47,8 @@
#include <string.h>
#include <setjmp.h>
#include <jpeglib.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

4
gdk-pixbuf/io-png.c
View File

@ -25,8 +25,8 @@
#include <config.h>
#include <stdio.h>
#include <png.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

5
gdk-pixbuf/io-pnm.c
View File

@ -26,9 +26,8 @@
#include <stdlib.h>
#include <string.h>
#include <setjmp.h>
#include <jpeglib.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

9
gdk-pixbuf/io-ras.c
View File

@ -33,12 +33,9 @@ Known bugs:
#include <config.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

6
gdk-pixbuf/io-tiff.c
View File

@ -27,10 +27,10 @@
#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <tiffio.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#include <unistd.h>
#include <tiffio.h>
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-io.h"

2
gdk-pixbuf/io-xpm.c
View File

@ -27,7 +27,7 @@
#include <string.h>
#include <glib.h>
#include <gdk/gdk.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"

4
gdk/gdkpixbuf-drawable.c
View File

@ -14,8 +14,8 @@
#include <string.h>
#include <glib.h>
#include <gmodule.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-drawable.h"
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)

2
gdk/gdkpixbuf-render.c
View File

@ -23,7 +23,7 @@
#include <config.h>
#include <gdk/gdk.h>
#include <libart_lgpl/art_rect.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include "gdk-pixbuf.h"

3
gtk/gdk-pixbuf-loader.c
View File

@ -25,9 +25,10 @@
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <gtk/gtksignal.h>
#include "gdk-pixbuf-loader.h"
#include "gdk-pixbuf-io.h"
#include <gtk/gtksignal.h>

2
gtk/gdk-pixbuf-loader.h
View File

@ -28,7 +28,7 @@
#include <unistd.h>
#include <gtk/gtkobject.h>
#include "gdk-pixbuf/gdk-pixbuf.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef __cplusplus
extern "C" {