aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gif.c2
-rw-r--r--src/jpeg.c2
-rw-r--r--src/main.c6
-rw-r--r--src/util.c3
-rw-r--r--src/util.h1
5 files changed, 4 insertions, 10 deletions
diff --git a/src/gif.c b/src/gif.c
index 6928dd2..018b1db 100644
--- a/src/gif.c
+++ b/src/gif.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <string.h>
-#include "gif.h"
+#include "meh.h"
#define GIF87a 0
#define GIF89a 1
diff --git a/src/jpeg.c b/src/jpeg.c
index bf90f2d..427ef93 100644
--- a/src/jpeg.c
+++ b/src/jpeg.c
@@ -7,7 +7,7 @@
#include "jpeglib.h"
-#include "jpeg.h"
+#include "meh.h"
struct error_mgr{
struct jpeg_error_mgr pub;
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{
diff --git a/src/util.c b/src/util.c
deleted file mode 100644
index 55538e7..0000000
--- a/src/util.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "util.h"
-
diff --git a/src/util.h b/src/util.h
deleted file mode 100644
index 8b13789..0000000
--- a/src/util.h
+++ /dev/null
@@ -1 +0,0 @@
-