--- ray/src/px/pflip.c	1991/11/11 14:02:02	1.5
+++ ray/src/px/pflip.c	2012/05/17 17:36:14	2.10
@@ -1,17 +1,16 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: pflip.c,v 2.10 2012/05/17 17:36:14 greg Exp $";
 #endif
-
 /*
  * flip picture file horizontally and/or vertically
  */
 
 #include <stdio.h>
+#include  <time.h>
+#include  <string.h>
 
+#include "platform.h"
 #include "color.h"
-
 #include "resolu.h"
 
 int	order;				/* input orientation */
@@ -28,8 +27,13 @@ FILE	*fin;				/* input file */
 char	*progname;
 
 
-int
-neworder()			/* figure out new order from old */
+static void memerr(void);
+static void scanfile(void);
+static void flip(void);
+
+
+static int
+neworder(void)			/* figure out new order from old */
 {
 	register int  no;
 
@@ -45,13 +49,16 @@ neworder()			/* figure out new order from old */
 	return(no);
 }
 
-
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
-	int	i;
-
+	static char	picfmt[LPICFMT+1] = PICFMT;
+	int	i, rval;
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdout);
 	progname = argv[0];
 
 	for (i = 1; i < argc; i++)
@@ -63,28 +70,33 @@ char	*argv[];
 			correctorder++;
 		else
 			break;
+	if (i < argc-2)
+		goto userr;
+	if (!fhoriz && !fvert)
+		fprintf(stderr, "%s: warning - no operation\n", argv[0]);
 	if (i >= argc || argv[i][0] == '-') {
-		fprintf(stderr, "Usage: %s [-h][-v][-c] infile [outfile]\n",
-				progname);
+		if (fvert)
+			goto userr;
+		SET_FILE_BINARY(stdin);
+		fin = stdin;
+	} else if ((fin = fopen(argv[i], "r")) == NULL) {
+		fprintf(stderr, "%s: cannot open\n", argv[i]);
 		exit(1);
 	}
-	if ((fin = fopen(argv[i], "r")) == NULL) {
-		fprintf(stderr, "%s: cannot open\n", argv[1]);
-		exit(1);
-	}
 	if (i < argc-1 && freopen(argv[i+1], "w", stdout) == NULL) {
 		fprintf(stderr, "%s: cannot open\n", argv[i+1]);
 		exit(1);
 	}
 					/* transfer header */
-	if (checkheader(fin, COLRFMT, stdout) < 0) {
+	if ((rval = checkheader(fin, picfmt, stdout)) < 0) {
 		fprintf(stderr, "%s: input not a Radiance picture\n",
 				progname);
 		exit(1);
 	}
+	if (rval)
+		fputformat(picfmt, stdout);
 					/* add new header info. */
 	printargs(i, argv, stdout);
-	fputformat(COLRFMT, stdout);
 	putchar('\n');
 					/* get picture size */
 	if ((order = fgetresolu(&xres, &yres, fin)) < 0) {
@@ -98,17 +110,23 @@ char	*argv[];
 		scanfile();
 	flip();				/* flip the image */
 	exit(0);
+userr:
+	fprintf(stderr, "Usage: %s [-h][-v][-c] infile [outfile]\n",
+			progname);
+	exit(1);
 }
 
 
-memerr()
+static void
+memerr(void)
 {
 	fprintf(stderr, "%s: out of memory\n", progname);
 	exit(1);
 }
 
 
-scanfile()				/* scan to the end of file */
+static void
+scanfile(void)				/* scan to the end of file */
 {
 	extern long	ftell();
 	COLR	*scanin;
@@ -118,18 +136,20 @@ scanfile()				/* scan to the end of file */
 		memerr();
 	if ((scanin = (COLR *)malloc(xres*sizeof(COLR))) == NULL)
 		memerr();
-	for (y = yres-1; y >= 0; y--) {
+	for (y = yres-1; y > 0; y--) {
 		scanpos[y] = ftell(fin);
 		if (freadcolrs(scanin, xres, fin) < 0) {
 			fprintf(stderr, "%s: read error\n", progname);
 			exit(1);
 		}
 	}
-	free((char *)scanin);
+	scanpos[0] = ftell(fin);
+	free((void *)scanin);
 }
 
 
-flip()					/* flip the picture */
+static void
+flip(void)					/* flip the picture */
 {
 	COLR	*scanin, *scanout;
 	int	y;
@@ -159,6 +179,7 @@ flip()					/* flip the picture */
 			exit(1);
 		}
 	}
-	free((char *)scanin);
-	free((char *)scanout);
+	free((void *)scanin);
+	if (fhoriz)
+		free((void *)scanout);
 }