m-labs · Jan 15, 2012 · Jan 15, 2012 · Jan 15, 2012 · Jan 15, 2012 · Jan 15, 2012
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
@@ -570,20 +570,22 @@ void patch_free(struct patch *p)
 	free(p);
 }
 
-int patch_images_uptodate(const struct patch *p)
+struct patch *patch_refresh(struct patch *p)
 {
-	const struct image *img;
-	struct stat st;
+	struct image *img;
+	struct pixbuf *pixbuf;
 
 	for(img = p->images; img != p->images+IMAGE_COUNT; img++) {
 		if(!img->pixbuf)
 			continue;
-		if(lstat(img->filename, &st) < 0)
-			return 0;
-		if(st.st_mtime != img->st.st_mtime)
-			return 0;
+		pixbuf = pixbuf_update(img->pixbuf);
+		if(!pixbuf)
+			return NULL;
+		pixbuf_dec_ref(img->pixbuf);
+		img->pixbuf = pixbuf;
 	}
-	return 1;
+	p->ref++;
+	return p;
 }
 
 #endif
diff --git a/src/compiler/compiler.h b/src/compiler/compiler.h
@@ -247,16 +247,10 @@ struct patch {
 
 typedef void (*report_message)(const char *);
 
-static inline struct patch *patch_clone(struct patch *p)
-{
-	p->ref++;
-	return p;
-}
-
 struct patch *patch_compile(const char *basedir, const char *patch_code, report_message rmc);
 struct patch *patch_compile_filename(const char *filename, const char *patch_code, report_message rmc);
 struct patch *patch_copy(struct patch *p);
 void patch_free(struct patch *p);
-int patch_images_uptodate(const struct patch *p);
+struct patch *patch_refresh(struct patch *p);
 
 #endif /* __COMPILER_H */
diff --git a/src/gui/performance.c b/src/gui/performance.c
@@ -334,9 +334,8 @@ static struct patch *cache_lookup(const struct patch_info *pi)
 
 	for(c = cache; c; c = c->next)
 		if(c->st.st_mtime == pi->st.st_mtime &&
-		    !strcmp(c->filename, pi->filename) &&
-		    patch_images_uptodate(c->p))
-			return patch_clone(c->p);
+		    !strcmp(c->filename, pi->filename))
+			return patch_refresh(c->p);
 	return NULL;
 }
 

diff --git a/src/pixbuf/loaderjpeg.c b/src/pixbuf/loaderjpeg.c
@@ -37,25 +37,20 @@ static void my_error_exit(j_common_ptr cinfo)
 	longjmp(myerr->setjmp_buffer, 1);
 }
 
-struct pixbuf *pixbuf_load_jpeg(char *filename)
+struct pixbuf *pixbuf_load_jpeg(FILE *file)
 {
-	struct pixbuf *ret;
-	FILE *fd;
+	struct pixbuf *ret = NULL;
 	struct jpeg_decompress_struct cinfo;
 	struct my_error_mgr jerr;
 	unsigned char *pixels;
 	int i;
 	unsigned char **row_pointers;
 
-	ret = NULL;
-	fd = fopen(filename, "rb");
-	if(fd == NULL) goto free0;
-
 	cinfo.err = jpeg_std_error((struct jpeg_error_mgr *)&jerr);
 	jerr.pub.error_exit = my_error_exit;
 	if(setjmp(jerr.setjmp_buffer)) goto free2;
 	jpeg_create_decompress(&cinfo);
-	jpeg_stdio_src(&cinfo, fd);
+	jpeg_stdio_src(&cinfo, file);
 	jpeg_read_header(&cinfo, TRUE);
 
 	cinfo.out_color_space = JCS_RGB;
@@ -76,7 +71,6 @@ struct pixbuf *pixbuf_load_jpeg(char *filename)
 
 	ret = pixbuf_new(cinfo.image_width, cinfo.image_height);
 	if(ret == NULL) goto free5;
-	ret->filename = strdup(filename);
 	if(!pixbuf_dither(ret->pixels, row_pointers, cinfo.image_width, cinfo.image_height, 0)) {
 		pixbuf_dec_ref(ret);
 		ret = NULL;
@@ -91,7 +85,5 @@ struct pixbuf *pixbuf_load_jpeg(char *filename)
 	free(pixels);
 free2:
 	jpeg_destroy_decompress(&cinfo);
-	fclose(fd);
-free0:
 	return ret;
-}
+}
diff --git a/src/pixbuf/loaderpng.c b/src/pixbuf/loaderpng.c
@@ -29,10 +29,9 @@
 #warning Floating point PNG is slow
 #endif
 
-struct pixbuf *pixbuf_load_png(char *filename)
+struct pixbuf *pixbuf_load_png(FILE *file)
 {
 	struct pixbuf *ret;
-	FILE *fd;
 	unsigned char header[8];
 	png_structp png_ptr;
 	png_infop info_ptr;
@@ -44,9 +43,7 @@ struct pixbuf *pixbuf_load_png(char *filename)
 	int y;
 
 	ret = NULL;
-	fd = fopen(filename, "r");
-	if(fd == NULL) goto free0;
-	fread(header, 1, 8, fd);
+	fread(header, 1, 8, file);
 	if(png_sig_cmp(header, 0, 8)) goto free1;
 
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -55,7 +52,7 @@ struct pixbuf *pixbuf_load_png(char *filename)
 	if(info_ptr == NULL) goto free2;
 
 	if(setjmp(png_jmpbuf(png_ptr))) goto free3;
-	png_init_io(png_ptr, fd);
+	png_init_io(png_ptr, file);
 	png_set_sig_bytes(png_ptr, 8);
 	png_read_info(png_ptr, info_ptr);
 
@@ -81,7 +78,6 @@ struct pixbuf *pixbuf_load_png(char *filename)
 
 	ret = pixbuf_new(width, height);
 	if(ret == NULL) goto free4;
-	ret->filename = strdup(filename);
 	if(!pixbuf_dither(ret->pixels, row_pointers, width, height, color_type == PNG_COLOR_TYPE_RGBA)) {
 		pixbuf_dec_ref(ret);
 		ret = NULL;
@@ -97,7 +93,5 @@ struct pixbuf *pixbuf_load_png(char *filename)
 free2:
 	png_destroy_read_struct(&png_ptr, NULL, NULL);
 free1:
-	fclose(fd);
-free0:
 	return ret;
-}
+}
diff --git a/src/pixbuf/loaders.h b/src/pixbuf/loaders.h
@@ -18,9 +18,11 @@
 #ifndef __PIXBUF_LOADERS_H
 #define __PIXBUF_LOADERS_H
 
+#include <stdio.h>
+
 #include "pixbuf.h"
 
-struct pixbuf *pixbuf_load_png(char *filename);
-struct pixbuf *pixbuf_load_jpeg(char *filename);
+struct pixbuf *pixbuf_load_png(FILE *file);
+struct pixbuf *pixbuf_load_jpeg(FILE *file);
 
-#endif /* __PIXBUF_LOADERS_H */
+#endif /* __PIXBUF_LOADERS_H */
diff --git a/src/pixbuf/manager.c b/src/pixbuf/manager.c
@@ -16,7 +16,9 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include "pixbuf.h"
 #include "loaders.h"
@@ -41,13 +43,14 @@ struct pixbuf *pixbuf_new(int width, int height)
 struct pixbuf *pixbuf_search(char *filename)
 {
 	struct pixbuf *p;
-
-	p = head;
-	while(p != NULL) {
-		if((p->filename != NULL) && (strcmp(p->filename, filename) == 0))
+	struct stat st;
+
+	if(lstat(filename, &st) < 0)
+		return NULL;
+	for(p = head; p; p = p->next)
+		if(strcmp(p->filename, filename) == 0 &&
+		    st.st_mtime == p->st.st_mtime)
 			return p;
-		p = p->next;
-	}
 	return NULL;
 }
 
@@ -59,43 +62,60 @@ void pixbuf_inc_ref(struct pixbuf *p)
 
 void pixbuf_dec_ref(struct pixbuf *p)
 {
-	struct pixbuf *prev;
+	struct pixbuf **anchor;
 
-	if(p != NULL) {
-		p->refcnt--;
-		if(p->refcnt == 0) {
-			if(p == head) {
-				head = head->next;
-				free(p->filename);
-				free(p);
-			} else {
-				prev = head;
-				while(prev->next != p)
-					prev = prev->next;
-				prev->next = p->next;
-				free(p->filename);
-				free(p);
-			}
-		}
-	}
+	if(!p)
+		return;
+	if(--p->refcnt)
+		return;
+	for(anchor = &head; *anchor != p; anchor = &(*anchor)->next);
+	*anchor = p->next;
+	free(p->filename);
+	free(p);
 }
 
 struct pixbuf *pixbuf_get(char *filename)
 {
 	struct pixbuf *p;
-
+	FILE *file;
+
 	p = pixbuf_search(filename);
 	if(p != NULL) {
 		pixbuf_inc_ref(p);
 		return p;
 	}
-
+
+	file = fopen(filename, "rb");
+	if(!file)
+		return NULL;
+
 	/* try all loaders */
-	p = pixbuf_load_png(filename);
-	if(p != NULL) return p;
-	p = pixbuf_load_jpeg(filename);
-	if(p != NULL) return p;
-
-	/* no loader was successful */
-	return NULL;
+	p = pixbuf_load_png(file);
+	if(!p) {
+		rewind(file);
+		p = pixbuf_load_jpeg(file);
+	}
+	if(p) {
+		p->filename = strdup(filename);
+		fstat(fileno(file), &p->st);
+		if(!p->filename) {
+			free(p);
+			p = NULL;
+		}
+	}
+	fclose(file);
+	return p;
+}
+
+struct pixbuf *pixbuf_update(struct pixbuf *p)
+{
+	struct stat st;
+
+	if(lstat(p->filename, &st) < 0)
+		return NULL;
+	if(st.st_mtime == p->st.st_mtime) {
+		p->refcnt++;
+		return p;
+	}
+	return pixbuf_get(p->filename);
 }
diff --git a/src/pixbuf/pixbuf.h b/src/pixbuf/pixbuf.h
@@ -18,9 +18,12 @@
 #ifndef __PIXBUF_PIXBUF_H
 #define __PIXBUF_PIXBUF_H
 
+#include <sys/stat.h>
+
 struct pixbuf {
 	int refcnt;
 	char *filename;
+	struct stat st;
 	struct pixbuf *next;
 	int width, height;
 	unsigned short pixels[];
@@ -32,5 +35,6 @@ void pixbuf_inc_ref(struct pixbuf *p);
 void pixbuf_dec_ref(struct pixbuf *p);
 
 struct pixbuf *pixbuf_get(char *filename);
+struct pixbuf *pixbuf_update(struct pixbuf *p);
 
 #endif /* __PIXBUF_PIXBUF_H */