Attachment #137977 for bug #183778

View | Details | Raw Unified | Return to bug 183778
Collapse All | Expand All

Lines 10-15 Link Here

(-)Makefile (-1 / +6 lines)
10	MAINTAINER= rum1cro@yandex.ru	10	MAINTAINER= rum1cro@yandex.ru
11	COMMENT= Image Viewer for X Window System with thumbnail preview feature	11	COMMENT= Image Viewer for X Window System with thumbnail preview feature
12		12
		13	LICENSE= GPLv2
		14
13	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png	15	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
14		16
15	.if !defined(WITHOUT_IMAGEMAGICK)	17	.if !defined(WITHOUT_IMAGEMAGICK)
Lines 23-27 Link Here
23	CPPFLAGS+= -I${LOCALBASE}/include	25	CPPFLAGS+= -I${LOCALBASE}/include
24	CONFIGURE_ARGS+= --without-included-gettext	26	CONFIGURE_ARGS+= --without-included-gettext
25		27
26	NO_STAGE= yes	28	PLIST_FILES= bin/danpei \
		29	share/locale/de/LC_MESSAGES/danpei.mo \
		30	share/locale/ja/LC_MESSAGES/danpei.mo
		31
27	.include <bsd.port.mk>	32	.include <bsd.port.mk>




--- src/image_cache.c.orig	2013-11-07 19:24:24.056322038 +0400
+++ src/image_cache.c	2013-11-07 19:32:26.759288924 +0400
@@ -356,7 +356,7 @@
   save_file = NULL;
   cl        = NULL;
 
-  if (tp->cache.cache_dir == NULL) { return; }
+  if (tp->cache.cache_dir == NULL) { return FALSE; }
 
   save_file = (gchar*)malloc(sizeof(gchar) * 
                              (strlen(tp->cache.cache_dir) +
@@ -761,9 +761,9 @@
    /* Initialize the local variables. */
    png_text_filename = buffer = NULL;
 
-   if (pixbuf == NULL)   { return; }
-   if (filename == NULL) { return; }
-   if (strcmp(filename, "") == 0) { return; }
+   if (pixbuf == NULL)   { return FALSE; }
+   if (filename == NULL) { return FALSE; }
+   if (strcmp(filename, "") == 0) { return FALSE; }
 
    fp = fopen (filename, "wb");
    if (fp == NULL) { return FALSE; }
@@ -782,7 +782,7 @@
       return FALSE;
    }

       png_destroy_write_struct(&png_ptr, &info_ptr);
       fclose (fp);
       return FALSE;
@@ -839,7 +839,7 @@
          /* expand RGB to RGBA using an opaque alpha value */
          gint x;
          gchar *buffer_ptr = buffer;
-         gchar *source_ptr = pixels;
+         guchar *source_ptr = pixels;
          for (x = 0; x < width; x++) {
             *buffer_ptr++ = *source_ptr++;
             *buffer_ptr++ = *source_ptr++;




--- src/viewer.c.orig	2013-11-07 19:33:02.807286361 +0400
+++ src/viewer.c	2013-11-07 19:34:22.533326686 +0400
@@ -293,7 +293,7 @@
 
   if ((dv->thumb == dv->current_thumb)  &&
       ((widget->allocation.x == dv->area_x) &&
-       (widget->allocation.y == dv->area_y)    )){ return; }
+       (widget->allocation.y == dv->area_y)    )){ return 1; }
 
   dv->area_x = widget->allocation.x;
   dv->area_y = widget->allocation.y;
@@ -314,7 +314,7 @@
       filename = g_strconcat(dv->thumb->path, "/", dv->thumb->filename, NULL);
     }
   }
-  if (filename == NULL) { return; }
+  if (filename == NULL) { return 1; }
 
   viewer_read_image(dv, filename, tp);
 
@@ -555,7 +555,7 @@
   while ((thumb != NULL) && (i < (tp->viewer).adj.value)) {
     thumb = thumb->next; i++;
   }
-  if (thumb == NULL) { return; }
+  if (thumb == NULL) { return FALSE; }
 
   gtk_window_set_title(GTK_WINDOW((tp->viewer).window), 
     g_strconcat(thumb->path, "/", thumb->filename, NULL));

Lines 1-3 Link Here

(-)pkg-plist (-3 lines)
1	bin/danpei
2	share/locale/de/LC_MESSAGES/danpei.mo
3	share/locale/ja/LC_MESSAGES/danpei.mo

Return to bug 183778

Lines 1-5 Link Here

(-)files/patch-image_cache.c (-2 / +33 lines)
1	--- src/image_cache.c.orig 2003-08-08 09:17:58.000000000 +0200	1	--- src/image_cache.c.orig 2013-11-07 19:24:24.056322038 +0400
2	+++ src/image_cache.c 2012-05-03 23:39:36.000000000 +0200	2	+++ src/image_cache.c 2013-11-07 19:32:26.759288924 +0400
		3	@@ -356,7 +356,7 @@
		4	save_file = NULL;
		5	cl = NULL;
		6
		7	- if (tp->cache.cache_dir == NULL) { return; }
		8	+ if (tp->cache.cache_dir == NULL) { return FALSE; }
		9
		10	save_file = (gchar)malloc(sizeof(gchar)
		11	(strlen(tp->cache.cache_dir) +
		12	@@ -761,9 +761,9 @@
		13	/* Initialize the local variables. */
		14	png_text_filename = buffer = NULL;
		15
		16	- if (pixbuf == NULL) { return; }
		17	- if (filename == NULL) { return; }
		18	- if (strcmp(filename, "") == 0) { return; }
		19	+ if (pixbuf == NULL) { return FALSE; }
		20	+ if (filename == NULL) { return FALSE; }
		21	+ if (strcmp(filename, "") == 0) { return FALSE; }
		22
		23	fp = fopen (filename, "wb");
		24	if (fp == NULL) { return FALSE; }
3	@@ -782,7 +782,7 @@	25	@@ -782,7 +782,7 @@
4	return FALSE;	26	return FALSE;
5	}	27	}
Lines 9-11 Link Here
9	png_destroy_write_struct(&png_ptr, &info_ptr);	31	png_destroy_write_struct(&png_ptr, &info_ptr);
10	fclose (fp);	32	fclose (fp);
11	return FALSE;	33	return FALSE;
		34	@@ -839,7 +839,7 @@
		35	/* expand RGB to RGBA using an opaque alpha value */
		36	gint x;
		37	gchar *buffer_ptr = buffer;
		38	- gchar *source_ptr = pixels;
		39	+ guchar *source_ptr = pixels;
		40	for (x = 0; x < width; x++) {
		41	buffer_ptr++ = source_ptr++;
		42	buffer_ptr++ = source_ptr++;

Line 0 Link Here

(-)files/patch-viewer.c (+29 lines)
	1	--- src/viewer.c.orig 2013-11-07 19:33:02.807286361 +0400
	2	+++ src/viewer.c 2013-11-07 19:34:22.533326686 +0400
	3	@@ -293,7 +293,7 @@
	4
	5	if ((dv->thumb == dv->current_thumb) &&
	6	((widget->allocation.x == dv->area_x) &&
	7	- (widget->allocation.y == dv->area_y) )){ return; }
	8	+ (widget->allocation.y == dv->area_y) )){ return 1; }
	9
	10	dv->area_x = widget->allocation.x;
	11	dv->area_y = widget->allocation.y;
	12	@@ -314,7 +314,7 @@
	13	filename = g_strconcat(dv->thumb->path, "/", dv->thumb->filename, NULL);
	14	}
	15	}
	16	- if (filename == NULL) { return; }
	17	+ if (filename == NULL) { return 1; }
	18
	19	viewer_read_image(dv, filename, tp);
	20
	21	@@ -555,7 +555,7 @@
	22	while ((thumb != NULL) && (i < (tp->viewer).adj.value)) {
	23	thumb = thumb->next; i++;
	24	}
	25	- if (thumb == NULL) { return; }
	26	+ if (thumb == NULL) { return FALSE; }
	27
	28	gtk_window_set_title(GTK_WINDOW((tp->viewer).window),
	29	g_strconcat(thumb->path, "/", thumb->filename, NULL));