@@ -1,4 +1,4 @@ | |||||
VERSION = git-20131117 | VERSION = git-20131213 | ||||
PREFIX = /usr/local | PREFIX = /usr/local | ||||
MANPREFIX = $(PREFIX)/share/man | MANPREFIX = $(PREFIX)/share/man | ||||
@@ -126,7 +126,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) | |||||
ColorMapObject *cmap; | ColorMapObject *cmap; | ||||
DATA32 bgpixel, *data, *ptr; | DATA32 bgpixel, *data, *ptr; | ||||
DATA32 *prev_frame = NULL; | DATA32 *prev_frame = NULL; | ||||
Imlib_Image *im; | Imlib_Image im; | ||||
int i, j, bg, r, g, b; | int i, j, bg, r, g, b; | ||||
int x, y, w, h, sw, sh; | int x, y, w, h, sw, sh; | ||||
int px, py, pw, ph; | int px, py, pw, ph; | ||||
@@ -25,7 +25,7 @@ | |||||
#include "window.h" | #include "window.h" | ||||
typedef struct { | typedef struct { | ||||
Imlib_Image *im; | Imlib_Image im; | ||||
unsigned int delay; | unsigned int delay; | ||||
} img_frame_t; | } img_frame_t; | ||||
@@ -38,7 +38,7 @@ typedef struct { | |||||
} multi_img_t; | } multi_img_t; | ||||
typedef struct { | typedef struct { | ||||
Imlib_Image *im; | Imlib_Image im; | ||||
int w; | int w; | ||||
int h; | int h; | ||||
@@ -62,11 +62,11 @@ char* tns_cache_filepath(const char *filepath) | |||||
return cfile; | return cfile; | ||||
} | } | ||||
Imlib_Image* tns_cache_load(const char *filepath) | Imlib_Image tns_cache_load(const char *filepath) | ||||
{ | { | ||||
char *cfile; | char *cfile; | ||||
struct stat cstats, fstats; | struct stat cstats, fstats; | ||||
Imlib_Image *im = NULL; | Imlib_Image im = NULL; | ||||
if (filepath == NULL) | if (filepath == NULL) | ||||
return 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; | bool use_cache, cache_hit = false; | ||||
float z, zw, zh; | float z, zw, zh; | ||||
thumb_t *t; | thumb_t *t; | ||||
Imlib_Image *im; | Imlib_Image im; | ||||
const char *fmt; | const char *fmt; | ||||
if (tns == NULL || tns->thumbs == NULL) | if (tns == NULL || tns->thumbs == NULL) | ||||
@@ -27,7 +27,7 @@ | |||||
typedef struct { | typedef struct { | ||||
const fileinfo_t *file; | const fileinfo_t *file; | ||||
Imlib_Image *im; | Imlib_Image im; | ||||
int w; | int w; | ||||
int h; | int h; | ||||
int x; | int x; | ||||