Attachment #194557 for bug #229271

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

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ufraw	4	PORTNAME= ufraw
5	PORTVERSION= 0.22	5	PORTVERSION= 0.22
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8		8
9	MAINTAINER= rodrigo@FreeBSD.org	9	MAINTAINER= rodrigo@FreeBSD.org




--- dcraw.cc.orig	2018-06-23 21:54:05 UTC
+++ dcraw.cc
@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw()
 

     if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
   }
   maximum = 0xff;
@@ -8946,7 +8949,7 @@ void CLASS identify()
     parse_fuji (get4());
     if (thumb_offset > 120) {
       fseek (ifp, 120, SEEK_SET);
-      is_raw += (i = get4()) && 1;
+      is_raw += (i = get4()) & 1;
       if (is_raw == 2 && shot_select)
 	parse_fuji (i);
     }
@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t
   strncpy (th->desc, desc, 512);
   strncpy (th->make, make, 64);
   strncpy (th->model, model, 64);
-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
+  strcpy (th->soft, " dcraw v " DCRAW_VERSION);
   t = localtime (&timestamp);
   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);

Line 0 Link Here

(-)files/patch-ufraw__developer.c (+11 lines)
	1	--- ufraw_developer.c.orig 2018-06-23 21:40:09 UTC
	2	+++ ufraw_developer.c
	3	@@ -387,7 +387,7 @@ static double findExpCoeff(double b)
	4	else a = b;
	5	bg = a / (1 - exp(-a));
	6	/* The limit on try is just to be sure there is no infinite loop. */
	7	- for (try = 0; abs(bg - b) > 0.001 \|\| try < 100; try++) {
	8	+ for (try = 0; fabs(bg - b) > 0.001 \|\| try < 100; try++) {
	9	a = a + (b - bg);
	10	bg = a / (1 - exp(-a));
	11	}

Return to bug 229271

Lines 1-4 Link Here

(-)files/patch-dcraw.cc (-1 / +19 lines)
1	--- dcraw.cc.orig 2018-04-03 22:16:35 UTC	1	--- dcraw.cc.orig 2018-06-23 21:54:05 UTC
2	+++ dcraw.cc	2	+++ dcraw.cc
3	@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw()	3	@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw()
4		4
Lines 21-23 Link Here
21	if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;	21	if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
22	}	22	}
23	maximum = 0xff;	23	maximum = 0xff;
		24	@@ -8946,7 +8949,7 @@ void CLASS identify()
		25	parse_fuji (get4());
		26	if (thumb_offset > 120) {
		27	fseek (ifp, 120, SEEK_SET);
		28	- is_raw += (i = get4()) && 1;
		29	+ is_raw += (i = get4()) & 1;
		30	if (is_raw == 2 && shot_select)
		31	parse_fuji (i);
		32	}
		33	@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t
		34	strncpy (th->desc, desc, 512);
		35	strncpy (th->make, make, 64);
		36	strncpy (th->model, model, 64);
		37	- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
		38	+ strcpy (th->soft, " dcraw v " DCRAW_VERSION);
		39	t = localtime (&timestamp);
		40	sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
		41	t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);