From f6b8e0eae4374f339487a33e3e4fe5462d5816e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 25 Nov 2017 10:16:00 +0100
Subject: New upstream version 2.0.0

---
 render/Jamfile        |  0
 render/License.txt    |  0
 render/Readme.txt     |  0
 render/afiles         |  0
 render/makecharts.ksh |  0
 render/render.c       | 13 +++++++++----
 render/render.h       |  0
 render/screens.h      |  0
 render/thscreen.c     |  0
 render/thscreen.h     |  0
 render/timage.c       |  2 +-
 11 files changed, 10 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 render/Jamfile
 mode change 100644 => 100755 render/License.txt
 mode change 100644 => 100755 render/Readme.txt
 mode change 100644 => 100755 render/afiles
 mode change 100644 => 100755 render/makecharts.ksh
 mode change 100644 => 100755 render/render.c
 mode change 100644 => 100755 render/render.h
 mode change 100644 => 100755 render/screens.h
 mode change 100644 => 100755 render/thscreen.c
 mode change 100644 => 100755 render/thscreen.h
 mode change 100644 => 100755 render/timage.c

(limited to 'render')

diff --git a/render/Jamfile b/render/Jamfile
old mode 100644
new mode 100755
diff --git a/render/License.txt b/render/License.txt
old mode 100644
new mode 100755
diff --git a/render/Readme.txt b/render/Readme.txt
old mode 100644
new mode 100755
diff --git a/render/afiles b/render/afiles
old mode 100644
new mode 100755
diff --git a/render/makecharts.ksh b/render/makecharts.ksh
old mode 100644
new mode 100755
diff --git a/render/render.c b/render/render.c
old mode 100644
new mode 100755
index d6ab108..b4acb6c
--- a/render/render.c
+++ b/render/render.c
@@ -84,7 +84,7 @@ static void cvt_Lab_to_CIELAB16(double *out, double *in) {
 		out[0] = 100.0;
 	out[0] = out[0] / 100.0 * 65535.0;
 
-	out[1] = in[1];
+	out[1] = 256.0 * in[1];
 	if (out[1] < -32768.0)
 		out[1] = -32768.0;
 	else if (out[1] > 32767.0)
@@ -92,7 +92,7 @@ static void cvt_Lab_to_CIELAB16(double *out, double *in) {
 	if (out[1] < 0.0)
 		out[1] = 65536.0 + out[1];
 
-	out[2] = in[2];
+	out[2] = 256.0 * in[2];
 	if (out[2] < -32768.0)
 		out[2] = -32768.0;
 	else if (out[2] > 32767.0)
@@ -733,6 +733,7 @@ static int render2d_write(
 						for (j = 0; j < s->ncc; j++)
 							pixv1[x][j] = rv[j];
 						pixv1[x][PRIX2D] = rv[PRIX2D];
+//printf("x %d y %d, set %f %f %f ix %f\n",x,y,rv[0],rv[1],rv[2], rv[PRIX2D]);
 					}
 					pthp = &th->xl;
 					th = th->xl;
@@ -827,7 +828,9 @@ static int render2d_write(
 
 				/* Translate from render value to output pixel value */
 				if (s->dpth == bpc8_2d) {
-					/* if dithering and dithering all or found FG in line */
+
+					/* if dithering and dithering all or found FG in line, */
+					/* start with 16 bit values to dither from */
 					if (s->dither) {
 						unsigned short *p = ((unsigned short *)dithbuf16) + x * s->ncc;
 
@@ -839,6 +842,8 @@ static int render2d_write(
 							for (j = 0; j < s->ncc; j++)
 								p[j] = (int)(65535.0 * cc[j] + 0.5);
 						}
+
+					/* Else quantize to 8 bits */
 					} else {
 						unsigned char *p = ((unsigned char *)outbuf) + x * s->ncc;
 						if (s->csp == lab_2d) {
@@ -932,6 +937,7 @@ static int render2d_write(
 #endif
 			if (fmt == tiff_file) {
 #ifdef RENDER_TIFF
+
 				if (TIFFWriteScanline(wh, outbuf, y, 0) < 0) {
 					a1loge(g_log, 1, "Failed to write TIFF file '%s' line %d\n",filename,y);
 					return 1;
@@ -1230,7 +1236,6 @@ static int rectvs2d_rend(prim2d *ss, color2d rv, double x, double y) {
 		rv[j] = 0.0;
 		for (i = 0; i < 4; i++)
 			rv[j] += b[i] * s->c[i][j];
-		rv[j] = rv[j];
 	}
 	rv[PRIX2D] = s->ix;
 
diff --git a/render/render.h b/render/render.h
old mode 100644
new mode 100755
diff --git a/render/screens.h b/render/screens.h
old mode 100644
new mode 100755
diff --git a/render/thscreen.c b/render/thscreen.c
old mode 100644
new mode 100755
diff --git a/render/thscreen.h b/render/thscreen.h
old mode 100644
new mode 100755
diff --git a/render/timage.c b/render/timage.c
old mode 100644
new mode 100755
index 20c999a..54ce04f
--- a/render/timage.c
+++ b/render/timage.c
@@ -39,7 +39,7 @@
 #include "render.h"
 
 #define DEF_DPI 200
-#define DITHER 0x8002			/* [0] 1 for test 8 bit dithering, 2 for test error diffusion */
+#define DITHER 0		/* [0] 1 for test 8 bit dithering, 2 for test error diffusion */
 							/* 0x8001 for dithering FG only, 0x8002 for err. diff. FG only */
 #undef PNG_MEM				/* Test PNG save to memory */
 
-- 
cgit v1.2.3