Browse Source

* Disabled gdkpixbuf code.

tags/v0.99.beta14
Sam Hocevar sam 21 years ago
parent
commit
a9e4b83c1b
2 changed files with 16 additions and 4 deletions
  1. +2
    -2
      examples/Makefile.am
  2. +14
    -2
      examples/demo.c

+ 2
- 2
examples/Makefile.am View File

@@ -20,8 +20,8 @@ bin_PROGRAMS = caca-demo caca-spritedit
caca_demo_SOURCES = demo.c caca_demo_SOURCES = demo.c
caca_demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm caca_demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
caca_demo_CPPFLAGS = -DDATADIR=\"$(pkgdatadir)\" 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 caca_spritedit_SOURCES = spritedit.c
caca_spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm caca_spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm


+ 14
- 2
examples/demo.c View File

@@ -27,8 +27,10 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>


#if 0
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkpixbuf.h> #include <gdk/gdkpixbuf.h>
#endif


#include "caca.h" #include "caca.h"


@@ -43,16 +45,20 @@ static void demo_boxes(void);
static void demo_ellipses(void); static void demo_ellipses(void);
static void demo_triangles(void); static void demo_triangles(void);
static void demo_sprites(void); static void demo_sprites(void);
#if 0
static void demo_blit(void); static void demo_blit(void);
#endif


int bounds = 0; int bounds = 0;
int outline = 0; int outline = 0;
int dithering = 0; int dithering = 0;
struct caca_sprite *sprite = NULL; struct caca_sprite *sprite = NULL;


#if 0
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
char *pixels; char *pixels;
int bufx, bufy, bufpitch; int bufx, bufy, bufpitch;
#endif


int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@@ -73,6 +79,7 @@ int main(int argc, char **argv)
if(!sprite) if(!sprite)
sprite = caca_load_sprite("examples/caca.txt"); sprite = caca_load_sprite("examples/caca.txt");


#if 0
gdk_init (&argc, &argv); gdk_init (&argc, &argv);
//pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/gally4.jpeg", NULL); //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/gally4.jpeg", NULL);
//pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/badge1.jpeg", NULL); //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/badge1.jpeg", NULL);
@@ -95,6 +102,7 @@ if(!pixbuf) return -2;
bufpitch = gdk_pixbuf_get_rowstride(pixbuf); bufpitch = gdk_pixbuf_get_rowstride(pixbuf);
fprintf(stderr, "bits: %i\n", gdk_pixbuf_get_bits_per_sample(pixbuf)); fprintf(stderr, "bits: %i\n", gdk_pixbuf_get_bits_per_sample(pixbuf));
fprintf(stderr, "w %i, h %i, stride %i\n", bufx, bufy, bufpitch); fprintf(stderr, "w %i, h %i, stride %i\n", bufx, bufy, bufpitch);
#endif


/* Main menu */ /* Main menu */
display_menu(); display_menu();
@@ -165,10 +173,12 @@ fprintf(stderr, "w %i, h %i, stride %i\n", bufx, bufy, bufpitch);
case 'S': case 'S':
demo = demo_sprites; demo = demo_sprites;
break; break;
#if 0
case 'i': case 'i':
case 'I': case 'I':
demo = demo_blit; demo = demo_blit;
break; break;
#endif
} }


if(demo) if(demo)
@@ -232,7 +242,9 @@ static void display_menu(void)
caca_putstr(4, 12, "'5': ellipses"); caca_putstr(4, 12, "'5': ellipses");
caca_putstr(4, 13, "'s': sprites"); caca_putstr(4, 13, "'s': sprites");
caca_putstr(4, 14, "'c': color"); caca_putstr(4, 14, "'c': color");
#if 0
caca_putstr(4, 15, "'i': image blit"); caca_putstr(4, 15, "'i': image blit");
#endif


caca_putstr(4, 17, "settings:"); caca_putstr(4, 17, "settings:");
caca_printf(4, 18, "'o': outline: %s", caca_printf(4, 18, "'o': outline: %s",
@@ -490,11 +502,11 @@ static void demo_sprites(void)
caca_rand(0, caca_get_height() - 1), sprite, 0); caca_rand(0, caca_get_height() - 1), sprite, 0);
} }


#if 0
static void demo_blit(void) static void demo_blit(void)
{ {
#if 0
caca_blit(6, 4, caca_get_width() - 6, caca_get_height() - 4, caca_blit(6, 4, caca_get_width() - 6, caca_get_height() - 4,
pixels, bufx, bufy); pixels, bufx, bufy);
#endif
} }
#endif



Loading…
Cancel
Save