Fixed Imlib file handle type, issue #117
This commit is contained in:
		
							parent
							
								
									9ab9cee088
								
							
						
					
					
						commit
						99dfd14919
					
				
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| VERSION = git-20131117 | ||||
| VERSION = git-20131213 | ||||
| 
 | ||||
| PREFIX    = /usr/local | ||||
| MANPREFIX = $(PREFIX)/share/man | ||||
|  | ||||
							
								
								
									
										2
									
								
								image.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								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; | ||||
|  | ||||
							
								
								
									
										4
									
								
								image.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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; | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										6
									
								
								thumbs.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								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) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Bert Münnich
						Bert Münnich