ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/pvalue.c
(Generate patch)

Comparing ray/src/px/pvalue.c (file contents):
Revision 2.24 by greg, Wed Oct 22 02:06:35 2003 UTC vs.
Revision 2.28 by greg, Fri Oct 1 07:46:26 2004 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   #include  "standard.h"
12   #include  "color.h"
13   #include  "resolu.h"
14 + #include  "view.h"
15  
16   #define  min(a,b)               ((a)<(b)?(a):(b))
17  
# Line 19 | Line 20 | static const char RCSid[] = "$Id$";
20   #define  BRIGHT         4
21  
22   RESOLU  picres;                 /* resolution of picture */
22 –
23   int  uniq = 0;                  /* print only unique values? */
24 –
24   int  doexposure = 0;            /* exposure change? (>100 to print) */
26 –
25   int  dataonly = 0;              /* data only format? */
28 –
26   int  putprim = ALL;             /* what to put out */
30 –
27   int  reverse = 0;               /* reverse conversion? */
32 –
28   int  format = 'a';              /* input/output format */
29   char  *fmtid = "ascii";         /* format identifier for header */
35 –
30   int  header = 1;                /* do header? */
37 –
31   long  skipbytes = 0;            /* skip bytes in input? */
39 –
32   int  swapbytes = 0;             /* swap bytes? */
41 –
33   int  interleave = 1;            /* file is interleaved? */
43 –
34   int  resolution = 1;            /* put/get resolution string? */
45 –
35   int  original = 0;              /* convert to original values? */
47 –
36   int  wrongformat = 0;           /* wrong input format? */
49 –
37   double  gamcor = 1.0;           /* gamma correction */
38  
39   int  ord[3] = {RED, GRN, BLU};  /* RGB ordering */
# Line 59 | Line 46 | char  *progname;
46   FILE  *fin;
47   FILE  *fin2 = NULL, *fin3 = NULL;       /* for other color channels */
48  
62 – int  (*getval)(), (*putval)();
49  
50 < double
51 < rgb_bright(clr)
52 < COLOR  clr;
50 > typedef int getfunc_t(COLOR  col);
51 > typedef int putfunc_t(COLOR  col);
52 > typedef double brightfunc_t(COLOR  col);
53 >
54 > getfunc_t *getval;
55 > putfunc_t *putval;
56 > brightfunc_t *mybright;
57 >
58 > static gethfunc checkhead;
59 > static brightfunc_t rgb_bright, xyz_bright;
60 > static getfunc_t getbascii, getbint, getbdouble, getbfloat, getbbyte, getbword;
61 > static getfunc_t getcascii, getcint, getcdouble, getcfloat, getcbyte, getcword;
62 > static putfunc_t putbascii, putbint, putbdouble, putbfloat, putbbyte, putbword;
63 > static putfunc_t putcascii, putcint, putcdouble, putcfloat, putcbyte, putcword;
64 > static putfunc_t putpascii, putpint, putpdouble, putpfloat, putpbyte, putpword;
65 >
66 > static void set_io(void);
67 > static void pixtoval(void);
68 > static void valtopix(void);
69 > static void swap16(uint16  *wp, int  n);
70 > static void swap32(uint32  *wp, int  n);
71 > static void swap64(char  *wp, int  n);
72 >
73 >
74 > static double
75 > rgb_bright(
76 >        COLOR  clr
77 > )
78   {
79          return(bright(clr));
80   }
81  
82 < double
83 < xyz_bright(clr)
84 < COLOR  clr;
82 > static double
83 > xyz_bright(
84 >        COLOR  clr
85 > )
86   {
87          return(clr[CIEY]);
88   }
89  
90 < double  (*mybright)() = &rgb_bright;
91 <
92 <
93 < main(argc, argv)
94 < int  argc;
83 < char  **argv;
90 > int
91 > main(
92 >        int  argc,
93 >        char  **argv
94 > )
95   {
85 –        extern int  checkhead();
86 –        extern long  atol();
96          double  d, expval = 1.0;
97          int  i;
98  
99          progname = argv[0];
100 +        mybright = &rgb_bright; /* default */
101  
102          for (i = 1; i < argc; i++)
103                  if (argv[i][0] == '-' || argv[i][0] == '+')
# Line 350 | Line 360 | unkopt:
360          }
361  
362          quit(0);
363 +        return 0; /* pro forma return */
364   }
365  
366  
367 < int
368 < checkhead(line)                         /* deal with line from header */
369 < char  *line;
367 > static int
368 > checkhead(                              /* deal with line from header */
369 >        char    *line,
370 >        void    *p
371 > )
372   {
373          char    fmt[32];
374          double  d;
375          COLOR   ctmp;
376  
377          if (formatval(fmt, line)) {
378 <                if (!strcmp(fmt, CIEFMT)) {
378 >                if (!strcmp(fmt, CIEFMT))
379                          mybright = &xyz_bright;
380 <                        if (original) {
368 <                                scalecolor(exposure, 1./WHTEFFICACY);
369 <                                doexposure++;
370 <                        }
371 <                } else if (!strcmp(fmt, COLRFMT))
380 >                else if (!strcmp(fmt, COLRFMT))
381                          mybright = &rgb_bright;
382                  else
383                          wrongformat++;
# Line 388 | Line 397 | char  *line;
397   }
398  
399  
400 < pixtoval()                              /* convert picture to values */
400 > static void
401 > pixtoval(void)                          /* convert picture to values */
402   {
403          register COLOR  *scanln;
404          int  dogamma;
# Line 461 | Line 471 | pixtoval()                             /* convert picture to values */
471   }
472  
473  
474 < valtopix()                      /* convert values to a pixel file */
474 > static void
475 > valtopix(void)                  /* convert values to a pixel file */
476   {
477          int  dogamma;
478          register COLOR  *scanln;
# Line 513 | Line 524 | int  code;
524   }
525  
526  
527 < swap16(wp, n)           /* swap n 16-bit words */
528 < register uint16  *wp;
529 < int  n;
527 > static void
528 > swap16(         /* swap n 16-bit words */
529 >        register uint16  *wp,
530 >        int  n
531 > )
532   {
533          while (n-- > 0) {
534                  *wp = *wp << 8 | ((*wp >> 8) & 0xff);
# Line 524 | Line 537 | int  n;
537   }
538  
539  
540 < swap32(wp, n)           /* swap n 32-bit words */
541 < register uint32  *wp;
542 < int  n;
540 > static void
541 > swap32(         /* swap n 32-bit words */
542 >        register uint32  *wp,
543 >        int  n
544 > )
545   {
546          while (n-- > 0) {
547                  *wp = *wp << 24 | ((*wp >> 24) & 0xff) |
# Line 536 | Line 551 | int  n;
551   }
552  
553  
554 < swap64(wp, n)           /* swap n 64-bit words */
555 < register char  *wp;
556 < int  n;
554 > static void
555 > swap64(         /* swap n 64-bit words */
556 >        register char  *wp,
557 >        int  n
558 > )
559   {
560          register int    t;
561  
# Line 552 | Line 569 | int  n;
569   }
570  
571  
572 < getcascii(col)          /* get an ascii color value from stream(s) */
573 < COLOR  col;
572 > static int
573 > getcascii(              /* get an ascii color value from stream(s) */
574 >        COLOR  col
575 > )
576   {
577          double  vd[3];
578  
# Line 571 | Line 590 | COLOR  col;
590   }
591  
592  
593 < getcdouble(col)         /* get a double color value from stream(s) */
594 < COLOR  col;
593 > static int
594 > getcdouble(             /* get a double color value from stream(s) */
595 >        COLOR  col
596 > )
597   {
598          double  vd[3];
599  
# Line 592 | Line 613 | COLOR  col;
613   }
614  
615  
616 < getcfloat(col)          /* get a float color value from stream(s) */
617 < COLOR  col;
616 > static int
617 > getcfloat(              /* get a float color value from stream(s) */
618 >        COLOR  col
619 > )
620   {
621          float  vf[3];
622  
# Line 613 | Line 636 | COLOR  col;
636   }
637  
638  
639 < getcint(col)            /* get an int color value from stream(s) */
640 < COLOR  col;
639 > static int
640 > getcint(                /* get an int color value from stream(s) */
641 >        COLOR  col
642 > )
643   {
644          int  vi[3];
645  
# Line 633 | Line 658 | COLOR  col;
658   }
659  
660  
661 < getcbyte(col)           /* get a byte color value from stream(s) */
662 < COLOR  col;
661 > static int
662 > getcbyte(               /* get a byte color value from stream(s) */
663 >        COLOR  col
664 > )
665   {
666          BYTE  vb[3];
667  
# Line 653 | Line 680 | COLOR  col;
680   }
681  
682  
683 < getcword(col)           /* get a 16-bit color value from stream(s) */
684 < COLOR  col;
683 > static int
684 > getcword(               /* get a 16-bit color value from stream(s) */
685 >        COLOR  col
686 > )
687   {
688          uint16  vw[3];
689  
# Line 675 | Line 704 | COLOR  col;
704   }
705  
706  
707 < getbascii(col)          /* get an ascii brightness value from fin */
708 < COLOR  col;
707 > static int
708 > getbascii(              /* get an ascii brightness value from fin */
709 >        COLOR  col
710 > )
711   {
712          double  vd;
713  
# Line 687 | Line 718 | COLOR  col;
718   }
719  
720  
721 < getbdouble(col)         /* get a double brightness value from fin */
722 < COLOR  col;
721 > static int
722 > getbdouble(             /* get a double brightness value from fin */
723 >        COLOR  col
724 > )
725   {
726          double  vd;
727  
# Line 701 | Line 734 | COLOR  col;
734   }
735  
736  
737 < getbfloat(col)          /* get a float brightness value from fin */
738 < COLOR  col;
737 > static int
738 > getbfloat(              /* get a float brightness value from fin */
739 >        COLOR  col
740 > )
741   {
742          float  vf;
743  
# Line 715 | Line 750 | COLOR  col;
750   }
751  
752  
753 < getbint(col)            /* get an int brightness value from fin */
754 < COLOR  col;
753 > static int
754 > getbint(                /* get an int brightness value from fin */
755 >        COLOR  col
756 > )
757   {
758          int  vi;
759          double  d;
# Line 729 | Line 766 | COLOR  col;
766   }
767  
768  
769 < getbbyte(col)           /* get a byte brightness value from fin */
770 < COLOR  col;
769 > static int
770 > getbbyte(               /* get a byte brightness value from fin */
771 >        COLOR  col
772 > )
773   {
774          BYTE  vb;
775          double  d;
# Line 743 | Line 782 | COLOR  col;
782   }
783  
784  
785 < getbword(col)           /* get a 16-bit brightness value from fin */
786 < COLOR  col;
785 > static int
786 > getbword(               /* get a 16-bit brightness value from fin */
787 >        COLOR  col
788 > )
789   {
790          uint16  vw;
791          double  d;
# Line 759 | Line 800 | COLOR  col;
800   }
801  
802  
803 < putcascii(col)                  /* put an ascii color to stdout */
804 < COLOR  col;
803 > static int
804 > putcascii(                      /* put an ascii color to stdout */
805 >        COLOR  col
806 > )
807   {
808          fprintf(stdout, "%15.3e %15.3e %15.3e\n",
809                          colval(col,ord[0]),
# Line 771 | Line 814 | COLOR  col;
814   }
815  
816  
817 < putcfloat(col)                  /* put a float color to stdout */
818 < COLOR  col;
817 > static int
818 > putcfloat(                      /* put a float color to stdout */
819 >        COLOR  col
820 > )
821   {
822          float  vf[3];
823  
# Line 787 | Line 832 | COLOR  col;
832   }
833  
834  
835 < putcdouble(col)                 /* put a double color to stdout */
836 < COLOR  col;
835 > static int
836 > putcdouble(                     /* put a double color to stdout */
837 >        COLOR  col
838 > )
839   {
840          double  vd[3];
841  
# Line 803 | Line 850 | COLOR  col;
850   }
851  
852  
853 < putcint(col)                    /* put an int color to stdout */
854 < COLOR  col;
853 > static int
854 > putcint(                        /* put an int color to stdout */
855 >        COLOR  col
856 > )
857   {
858          fprintf(stdout, "%d %d %d\n",
859                          (int)(colval(col,ord[0])*256.),
# Line 815 | Line 864 | COLOR  col;
864   }
865  
866  
867 < putcbyte(col)                   /* put a byte color to stdout */
868 < COLOR  col;
867 > static int
868 > putcbyte(                       /* put a byte color to stdout */
869 >        COLOR  col
870 > )
871   {
872          long  i;
873          BYTE  vb[3];
# Line 833 | Line 884 | COLOR  col;
884   }
885  
886  
887 < putcword(col)                   /* put a 16-bit color to stdout */
888 < COLOR  col;
887 > static int
888 > putcword(                       /* put a 16-bit color to stdout */
889 >        COLOR  col
890 > )
891   {
892          long  i;
893          uint16  vw[3];
# Line 853 | Line 906 | COLOR  col;
906   }
907  
908  
909 < putbascii(col)                  /* put an ascii brightness to stdout */
910 < COLOR  col;
909 > static int
910 > putbascii(                      /* put an ascii brightness to stdout */
911 >        COLOR  col
912 > )
913   {
914          fprintf(stdout, "%15.3e\n", (*mybright)(col));
915  
# Line 862 | Line 917 | COLOR  col;
917   }
918  
919  
920 < putbfloat(col)                  /* put a float brightness to stdout */
921 < COLOR  col;
920 > static int
921 > putbfloat(                      /* put a float brightness to stdout */
922 >        COLOR  col
923 > )
924   {
925          float  vf;
926  
# Line 876 | Line 933 | COLOR  col;
933   }
934  
935  
936 < putbdouble(col)                 /* put a double brightness to stdout */
937 < COLOR  col;
936 > static int
937 > putbdouble(                     /* put a double brightness to stdout */
938 >        COLOR  col
939 > )
940   {
941          double  vd;
942  
# Line 890 | Line 949 | COLOR  col;
949   }
950  
951  
952 < putbint(col)                    /* put an int brightness to stdout */
953 < COLOR  col;
952 > static int
953 > putbint(                        /* put an int brightness to stdout */
954 >        COLOR  col
955 > )
956   {
957          fprintf(stdout, "%d\n", (int)((*mybright)(col)*256.));
958  
# Line 899 | Line 960 | COLOR  col;
960   }
961  
962  
963 < putbbyte(col)                   /* put a byte brightness to stdout */
964 < COLOR  col;
963 > static int
964 > putbbyte(                       /* put a byte brightness to stdout */
965 >        COLOR  col
966 > )
967   {
968          register int  i;
969          BYTE  vb;
# Line 913 | Line 976 | COLOR  col;
976   }
977  
978  
979 < putbword(col)                   /* put a 16-bit brightness to stdout */
980 < COLOR  col;
979 > static int
980 > putbword(                       /* put a 16-bit brightness to stdout */
981 >        COLOR  col
982 > )
983   {
984          long  i;
985          uint16  vw;
# Line 929 | Line 994 | COLOR  col;
994   }
995  
996  
997 < putpascii(col)                  /* put an ascii primary to stdout */
998 < COLOR  col;
997 > static int
998 > putpascii(                      /* put an ascii primary to stdout */
999 >        COLOR  col
1000 > )
1001   {
1002          fprintf(stdout, "%15.3e\n", colval(col,putprim));
1003  
# Line 938 | Line 1005 | COLOR  col;
1005   }
1006  
1007  
1008 < putpfloat(col)                  /* put a float primary to stdout */
1009 < COLOR  col;
1008 > static int
1009 > putpfloat(                      /* put a float primary to stdout */
1010 >        COLOR  col
1011 > )
1012   {
1013          float  vf;
1014  
# Line 952 | Line 1021 | COLOR  col;
1021   }
1022  
1023  
1024 < putpdouble(col)                 /* put a double primary to stdout */
1025 < COLOR  col;
1024 > static int
1025 > putpdouble(                     /* put a double primary to stdout */
1026 >        COLOR  col
1027 > )
1028   {
1029          double  vd;
1030  
# Line 966 | Line 1037 | COLOR  col;
1037   }
1038  
1039  
1040 < putpint(col)                    /* put an int primary to stdout */
1041 < COLOR  col;
1040 > static int
1041 > putpint(                        /* put an int primary to stdout */
1042 >        COLOR  col
1043 > )
1044   {
1045          fprintf(stdout, "%d\n", (int)(colval(col,putprim)*256.));
1046  
# Line 975 | Line 1048 | COLOR  col;
1048   }
1049  
1050  
1051 < putpbyte(col)                   /* put a byte primary to stdout */
1052 < COLOR  col;
1051 > static int
1052 > putpbyte(                       /* put a byte primary to stdout */
1053 >        COLOR  col
1054 > )
1055   {
1056          long  i;
1057          BYTE  vb;
# Line 989 | Line 1064 | COLOR  col;
1064   }
1065  
1066  
1067 < putpword(col)                   /* put a 16-bit primary to stdout */
1068 < COLOR  col;
1067 > static int
1068 > putpword(                       /* put a 16-bit primary to stdout */
1069 >        COLOR  col
1070 > )
1071   {
1072          long  i;
1073          uint16  vw;
# Line 1005 | Line 1082 | COLOR  col;
1082   }
1083  
1084  
1085 < set_io()                        /* set put and get functions */
1085 > static void
1086 > set_io(void)                    /* set put and get functions */
1087   {
1088          switch (format) {
1089          case 'a':                                       /* ascii */
# Line 1133 | Line 1211 | set_io()                       /* set put and get functions */
1211                  }
1212                  return;
1213          }
1214 < badopt:
1214 > /* badopt: */ /* label not used */
1215          fprintf(stderr, "%s: botched file type\n", progname);
1216          quit(1);
1217   namerr:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines