Changeset 206Tweet

Timestamp:

Nov 22, 2003, 1:51:27 PM (20 years ago)

Author:

Sam Hocevar

Message:

• Disabled gdkpixbuf code.

Location:

libcaca/trunk/examples

Files:

• Makefile.am (modified) (1 diff)
• demo.c (modified) (8 diffs)

libcaca/trunk/examples/Makefile.am

@@ -21 +21 @@
 caca_demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 caca_demo_CPPFLAGS = -DDATADIR=\"$(pkgdatadir)\"
-caca_demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
-caca_demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
+#caca_demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
+#caca_demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
 
 caca_spritedit_SOURCES = spritedit.c

libcaca/trunk/examples/demo.c

@@ -28 +28 @@
 #include <stdio.h>
 
+#if 0
 #include <gdk/gdk.h>
 #include <gdk/gdkpixbuf.h>
+#endif
 
 #include "caca.h"
@@ -44 +46 @@
 static void demo_triangles(void);
 static void demo_sprites(void);
+#if 0
 static void demo_blit(void);
+#endif
 
 int bounds = 0;
@@ -51 +55 @@
 struct caca_sprite *sprite = NULL;
 
+#if 0
 GdkPixbuf *pixbuf;
 char *pixels;
 int bufx, bufy, bufpitch;
+#endif
 
 int main(int argc, char **argv)
@@ -74 +80 @@
         sprite = caca_load_sprite("examples/caca.txt");
 
+#if 0
 gdk_init (&argc, &argv);
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/gally4.jpeg", NULL);
@@ -96 +103 @@
 fprintf(stderr, "bits: %i\n", gdk_pixbuf_get_bits_per_sample(pixbuf));
 fprintf(stderr, "w %i, h %i, stride %i\n", bufx, bufy, bufpitch);
+#endif
 
     /* Main menu */
@@ -166 +174 @@
                 demo = demo_sprites;
                 break;
+#if 0
             case 'i':
             case 'I':
                 demo = demo_blit;
                 break;
+#endif
             }
 
@@ -233 +243 @@
     caca_putstr(4, 13, "'s': sprites");
     caca_putstr(4, 14, "'c': color");
+#if 0
     caca_putstr(4, 15, "'i': image blit");
+#endif
 
     caca_putstr(4, 17, "settings:");
@@ -491 +503 @@
 }
 
+#if 0
 static void demo_blit(void)
 {
-#if 0
     caca_blit(6, 4, caca_get_width() - 6, caca_get_height() - 4,
               pixels, bufx, bufy);
-#endif
-}
-
+}
+#endif
+