--- ray/src/px/ra_gif.c	1994/03/30 14:24:52	2.1
+++ ray/src/px/ra_gif.c	2003/07/27 22:12:03	2.10
@@ -1,26 +1,19 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: ra_gif.c,v 2.10 2003/07/27 22:12:03 schorsch Exp $";
 #endif
-
 /*
  * Convert from Radiance picture file to Compuserve GIF.
  * Currently, we don't know how to get back.
  */
 
 #include  <stdio.h>
+#include  <time.h>
+#include  <math.h>
 
+#include  "platform.h"
 #include  "color.h"
-
 #include  "resolu.h"
 
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
-
-#include  <math.h>
-
 #define MAXCOLORS		256
 
 int rmap[MAXCOLORS];
@@ -33,11 +26,14 @@ extern long  ftell();
 
 long  picstart;
 
-extern BYTE  clrtab[][3];
+BYTE  clrtab[256][3];
 
+extern int  samplefac;
+
 extern int  getgifpix();
 
 COLR	*scanln;
+BYTE	*pixscan;
 
 int  xmax, ymax;			/* picture size */
 
@@ -45,8 +41,12 @@ double	gamv = 2.2;			/* gamma correction */
 
 int  greyscale = 0;			/* convert to B&W? */
 
+int  dither = 1;			/* dither colors? */
+
 int  bradj = 0;				/* brightness adjustment */
 
+int  ncolors = 0;			/* number of colors requested */
+
 char  *progname;
 
 
@@ -54,16 +54,13 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	int  ncolors = 0;
 	int  bitsperpix;
 	int  i;
-#ifdef MSDOS
-	extern int  _fmode;
-	_fmode = O_BINARY;
-	setmode(fileno(stdin), O_BINARY);
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	progname = argv[0];
+	samplefac = 0;
 
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
@@ -74,6 +71,9 @@ char  *argv[];
 			case 'b':
 				greyscale = 1;
 				break;
+			case 'd':
+				dither = !dither;
+				break;
 			case 'c':
 				ncolors = atoi(argv[++i]);
 				break;
@@ -82,6 +82,9 @@ char  *argv[];
 					goto userr;
 				bradj = atoi(argv[++i]);
 				break;
+			case 'n':
+				samplefac = atoi(argv[++i]);
+				break;
 			default:
 				goto userr;
 			}
@@ -115,7 +118,7 @@ char  *argv[];
 				/* set up gamma correction */
 	setcolrgam(gamv);
 				/* figure out the bits per pixel */
-	if (ncolors < 2 | ncolors > MAXCOLORS)
+	if ((ncolors < 2) | (ncolors > MAXCOLORS))
 		ncolors = MAXCOLORS;
 	for (bitsperpix = 1; ncolors > 1<<bitsperpix; bitsperpix++)
 		;
@@ -130,7 +133,7 @@ char  *argv[];
 	exit(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-b][-c ncolors][-g gamv][-e +/-stops] input [output]\n",
+	"Usage: %s [-b][-d][-n samp][-c ncolors][-g gamv][-e +/-stops] input [output]\n",
 			progname);
 	exit(1);
 }
@@ -149,11 +152,18 @@ int  y;
 		if (freadcolrs(scanln, xmax, stdin) < 0) {
 			fprintf(stderr, "%s: error reading picture (y==%d)\n",
 					progname, ymax-1-y);
+			exit(1);
 		}
 	while (++currow < y);
 	if (bradj)
 		shiftcolrs(scanln, xmax, bradj);
 	colrs_gambs(scanln, xmax);
+	if (pixscan != NULL) {
+		if (samplefac)
+			neu_dith_colrs(pixscan, scanln, xmax);
+		else
+			dith_colrs(pixscan, scanln, xmax);
+	}
 }
 
 
@@ -162,17 +172,30 @@ int	nc;
 {
 	register int	i;
 
-	new_histo();
+	if ((samplefac ? neu_init(xmax*ymax) : new_histo(xmax*ymax)) == -1)
+		goto memerr;
 	for (i = 0; i < ymax; i++) {
 		getrow(i);
-		cnt_colrs(scanln, xmax);
+		if (samplefac)
+			neu_colrs(scanln, xmax);
+		else
+			cnt_colrs(scanln, xmax);
 	}
-	new_clrtab(nc);
+	if (samplefac)
+		neu_clrtab(nc);
+	else
+		new_clrtab(nc);
 	for (i = 0; i < nc; i++) {
 		rmap[i] = clrtab[i][RED];
 		gmap[i] = clrtab[i][GRN];
 		bmap[i] = clrtab[i][BLU];
 	}
+	if (dither && (pixscan = (BYTE *)malloc(xmax)) == NULL)
+		goto memerr;
+	return;
+memerr:
+	fprintf(stderr, "%s: out of memory\n", progname);
+	exit(1);
 }
 
 
@@ -197,8 +220,10 @@ int  x, y;
 
 	getrow(y);
 	if (greyscale)
-		return(normbright(scanln[x]));
-	return(map_pixel(scanln[x]));
+		return((normbright(scanln[x])*ncolors)>>8);
+	if (pixscan != NULL)
+		return(pixscan[x]);
+	return(samplefac ? neu_map_pixel(scanln[x]) : map_pixel(scanln[x]));
 }