From 99dfd14919f55742cbd311bd6032ce0f1dc361c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bert=20M=C3=BCnnich?= <ber.t@posteo.de>
Date: Fri, 13 Dec 2013 13:04:45 +0100
Subject: [PATCH] Fixed Imlib file handle type, issue #117
---
Makefile | 2 +-
image.c | 2 +-
image.h | 4 ++--
thumbs.c | 6 +++---
thumbs.h | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index f542ad7..e261b1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20131117
+VERSION = git-20131213
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
diff --git a/image.c b/image.c
index ee49076..2d82f95 100644
--- a/image.c
+++ b/image.c
@@ -126,7 +126,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file)
ColorMapObject *cmap;
DATA32 bgpixel, *data, *ptr;
DATA32 *prev_frame = NULL;
- Imlib_Image *im;
+ Imlib_Image im;
int i, j, bg, r, g, b;
int x, y, w, h, sw, sh;
int px, py, pw, ph;
diff --git a/image.h b/image.h
index 09322c2..04d48a3 100644
--- a/image.h
+++ b/image.h
@@ -25,7 +25,7 @@
#include "window.h"
typedef struct {
- Imlib_Image *im;
+ Imlib_Image im;
unsigned int delay;
} img_frame_t;
@@ -38,7 +38,7 @@ typedef struct {
} multi_img_t;
typedef struct {
- Imlib_Image *im;
+ Imlib_Image im;
int w;
int h;
diff --git a/thumbs.c b/thumbs.c
index a1ee779..2090102 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -62,11 +62,11 @@ char* tns_cache_filepath(const char *filepath)
return cfile;
}
-Imlib_Image* tns_cache_load(const char *filepath)
+Imlib_Image tns_cache_load(const char *filepath)
{
char *cfile;
struct stat cstats, fstats;
- Imlib_Image *im = NULL;
+ Imlib_Image im = NULL;
if (filepath == NULL)
return NULL;
@@ -223,7 +223,7 @@ bool tns_load(tns_t *tns, int n, const fileinfo_t *file,
bool use_cache, cache_hit = false;
float z, zw, zh;
thumb_t *t;
- Imlib_Image *im;
+ Imlib_Image im;
const char *fmt;
if (tns == NULL || tns->thumbs == NULL)
diff --git a/thumbs.h b/thumbs.h
index 64ae412..758ae87 100644
--- a/thumbs.h
+++ b/thumbs.h
@@ -27,7 +27,7 @@
typedef struct {
const fileinfo_t *file;
- Imlib_Image *im;
+ Imlib_Image im;
int w;
int h;
int x;