nsxiv99dfd14
Fixed Imlib file handle type, issue #117
+8 −8
5 files changed
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20131117 | |
| 1 | + | VERSION = git-20131213 | |
| 2 | 2 | ||
| 3 | 3 | PREFIX = /usr/local | |
| 4 | 4 | MANPREFIX = $(PREFIX)/share/man | |
| @@ -126,7 +126,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) | |||
| 126 | 126 | ColorMapObject *cmap; | |
| 127 | 127 | DATA32 bgpixel, *data, *ptr; | |
| 128 | 128 | DATA32 *prev_frame = NULL; | |
| 129 | − | Imlib_Image *im; | |
| 129 | + | Imlib_Image im; | |
| 130 | 130 | int i, j, bg, r, g, b; | |
| 131 | 131 | int x, y, w, h, sw, sh; | |
| 132 | 132 | int px, py, pw, ph; | |
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | #include "window.h" | |
| 26 | 26 | ||
| 27 | 27 | typedef struct { | |
| 28 | − | Imlib_Image *im; | |
| 28 | + | Imlib_Image im; | |
| 29 | 29 | unsigned int delay; | |
| 30 | 30 | } img_frame_t; | |
| 31 | 31 | ||
| @@ -38,7 +38,7 @@ typedef struct { | |||
| 38 | 38 | } multi_img_t; | |
| 39 | 39 | ||
| 40 | 40 | typedef struct { | |
| 41 | − | Imlib_Image *im; | |
| 41 | + | Imlib_Image im; | |
| 42 | 42 | int w; | |
| 43 | 43 | int h; | |
| 44 | 44 | ||
| @@ -62,11 +62,11 @@ char* tns_cache_filepath(const char *filepath) | |||
| 62 | 62 | return cfile; | |
| 63 | 63 | } | |
| 64 | 64 | ||
| 65 | − | Imlib_Image* tns_cache_load(const char *filepath) | |
| 65 | + | Imlib_Image tns_cache_load(const char *filepath) | |
| 66 | 66 | { | |
| 67 | 67 | char *cfile; | |
| 68 | 68 | struct stat cstats, fstats; | |
| 69 | − | Imlib_Image *im = NULL; | |
| 69 | + | Imlib_Image im = NULL; | |
| 70 | 70 | ||
| 71 | 71 | if (filepath == NULL) | |
| 72 | 72 | return NULL; | |
| @@ -223,7 +223,7 @@ bool tns_load(tns_t *tns, int n, const fileinfo_t *file, | |||
| 223 | 223 | bool use_cache, cache_hit = false; | |
| 224 | 224 | float z, zw, zh; | |
| 225 | 225 | thumb_t *t; | |
| 226 | − | Imlib_Image *im; | |
| 226 | + | Imlib_Image im; | |
| 227 | 227 | const char *fmt; | |
| 228 | 228 | ||
| 229 | 229 | if (tns == NULL || tns->thumbs == NULL) | |
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | 28 | typedef struct { | |
| 29 | 29 | const fileinfo_t *file; | |
| 30 | − | Imlib_Image *im; | |
| 30 | + | Imlib_Image im; | |
| 31 | 31 | int w; | |
| 32 | 32 | int h; | |
| 33 | 33 | int x; | |