aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorJohn Hawthorn <jhawthor@uvic.ca>2008-05-22 01:49:16 -0700
committerJohn Hawthorn <jhawthor@uvic.ca>2008-05-22 01:49:16 -0700
commit9e76bd849a935eed17a4d22a9f49974272a36da5 (patch)
tree563f78ecfd230383fce3303662a190c890cff3d0 /src/main.c
parent3551b64bd20efb9c7378ef4fd606df35941d4ee9 (diff)
downloadmirror-meh-9e76bd849a935eed17a4d22a9f49974272a36da5.tar.gz
mirror-meh-9e76bd849a935eed17a4d22a9f49974272a36da5.tar.bz2
mirror-meh-9e76bd849a935eed17a4d22a9f49974272a36da5.zip
cleanup
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 8553495..8ee8367 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,8 +9,7 @@
#include <sys/time.h>
-#include "jpeg.h"
-#include "gif.h"
+#include "meh.h"
Display *display;
int screen;
@@ -127,8 +126,7 @@ unsigned char *loadbuf(const char *filename, int *bufwidth, int *bufheight){
if(head[0] == 0xff && head[1] == 0xd8){
buf = loadjpeg(f, bufwidth, bufheight);
}else if(!memcmp("\x89PNG", head, 4)){
- printf("IT'S A PNG!!!\n");
- buf = NULL;
+ buf = loadpng(f, bufwidth, bufheight);
}else if(!memcmp("GIF", head, 3)){
buf = loadgif(f, bufwidth, bufheight);
}else{