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.27 by greg, Fri Oct 1 07:45:30 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++;
384          } else if (original && isexpos(line)) {
385                  d = 1.0/exposval(line);
386                  scalecolor(exposure, d);
387 + fprintf(stderr, "scaled exposure by %f, now at %f\n", d, bright(exposure));
388                  doexposure++;
389          } else if (original && iscolcor(line)) {
390                  colcorval(ctmp, line);
# Line 388 | Line 398 | char  *line;
398   }
399  
400  
401 < pixtoval()                              /* convert picture to values */
401 > static void
402 > pixtoval(void)                          /* convert picture to values */
403   {
404          register COLOR  *scanln;
405          int  dogamma;
# Line 461 | Line 472 | pixtoval()                             /* convert picture to values */
472   }
473  
474  
475 < valtopix()                      /* convert values to a pixel file */
475 > static void
476 > valtopix(void)                  /* convert values to a pixel file */
477   {
478          int  dogamma;
479          register COLOR  *scanln;
# Line 513 | Line 525 | int  code;
525   }
526  
527  
528 < swap16(wp, n)           /* swap n 16-bit words */
529 < register uint16  *wp;
530 < int  n;
528 > static void
529 > swap16(         /* swap n 16-bit words */
530 >        register uint16  *wp,
531 >        int  n
532 > )
533   {
534          while (n-- > 0) {
535                  *wp = *wp << 8 | ((*wp >> 8) & 0xff);
# Line 524 | Line 538 | int  n;
538   }
539  
540  
541 < swap32(wp, n)           /* swap n 32-bit words */
542 < register uint32  *wp;
543 < int  n;
541 > static void
542 > swap32(         /* swap n 32-bit words */
543 >        register uint32  *wp,
544 >        int  n
545 > )
546   {
547          while (n-- > 0) {
548                  *wp = *wp << 24 | ((*wp >> 24) & 0xff) |
# Line 536 | Line 552 | int  n;
552   }
553  
554  
555 < swap64(wp, n)           /* swap n 64-bit words */
556 < register char  *wp;
557 < int  n;
555 > static void
556 > swap64(         /* swap n 64-bit words */
557 >        register char  *wp,
558 >        int  n
559 > )
560   {
561          register int    t;
562  
# Line 552 | Line 570 | int  n;
570   }
571  
572  
573 < getcascii(col)          /* get an ascii color value from stream(s) */
574 < COLOR  col;
573 > static int
574 > getcascii(              /* get an ascii color value from stream(s) */
575 >        COLOR  col
576 > )
577   {
578          double  vd[3];
579  
# Line 571 | Line 591 | COLOR  col;
591   }
592  
593  
594 < getcdouble(col)         /* get a double color value from stream(s) */
595 < COLOR  col;
594 > static int
595 > getcdouble(             /* get a double color value from stream(s) */
596 >        COLOR  col
597 > )
598   {
599          double  vd[3];
600  
# Line 592 | Line 614 | COLOR  col;
614   }
615  
616  
617 < getcfloat(col)          /* get a float color value from stream(s) */
618 < COLOR  col;
617 > static int
618 > getcfloat(              /* get a float color value from stream(s) */
619 >        COLOR  col
620 > )
621   {
622          float  vf[3];
623  
# Line 613 | Line 637 | COLOR  col;
637   }
638  
639  
640 < getcint(col)            /* get an int color value from stream(s) */
641 < COLOR  col;
640 > static int
641 > getcint(                /* get an int color value from stream(s) */
642 >        COLOR  col
643 > )
644   {
645          int  vi[3];
646  
# Line 633 | Line 659 | COLOR  col;
659   }
660  
661  
662 < getcbyte(col)           /* get a byte color value from stream(s) */
663 < COLOR  col;
662 > static int
663 > getcbyte(               /* get a byte color value from stream(s) */
664 >        COLOR  col
665 > )
666   {
667          BYTE  vb[3];
668  
# Line 653 | Line 681 | COLOR  col;
681   }
682  
683  
684 < getcword(col)           /* get a 16-bit color value from stream(s) */
685 < COLOR  col;
684 > static int
685 > getcword(               /* get a 16-bit color value from stream(s) */
686 >        COLOR  col
687 > )
688   {
689          uint16  vw[3];
690  
# Line 675 | Line 705 | COLOR  col;
705   }
706  
707  
708 < getbascii(col)          /* get an ascii brightness value from fin */
709 < COLOR  col;
708 > static int
709 > getbascii(              /* get an ascii brightness value from fin */
710 >        COLOR  col
711 > )
712   {
713          double  vd;
714  
# Line 687 | Line 719 | COLOR  col;
719   }
720  
721  
722 < getbdouble(col)         /* get a double brightness value from fin */
723 < COLOR  col;
722 > static int
723 > getbdouble(             /* get a double brightness value from fin */
724 >        COLOR  col
725 > )
726   {
727          double  vd;
728  
# Line 701 | Line 735 | COLOR  col;
735   }
736  
737  
738 < getbfloat(col)          /* get a float brightness value from fin */
739 < COLOR  col;
738 > static int
739 > getbfloat(              /* get a float brightness value from fin */
740 >        COLOR  col
741 > )
742   {
743          float  vf;
744  
# Line 715 | Line 751 | COLOR  col;
751   }
752  
753  
754 < getbint(col)            /* get an int brightness value from fin */
755 < COLOR  col;
754 > static int
755 > getbint(                /* get an int brightness value from fin */
756 >        COLOR  col
757 > )
758   {
759          int  vi;
760          double  d;
# Line 729 | Line 767 | COLOR  col;
767   }
768  
769  
770 < getbbyte(col)           /* get a byte brightness value from fin */
771 < COLOR  col;
770 > static int
771 > getbbyte(               /* get a byte brightness value from fin */
772 >        COLOR  col
773 > )
774   {
775          BYTE  vb;
776          double  d;
# Line 743 | Line 783 | COLOR  col;
783   }
784  
785  
786 < getbword(col)           /* get a 16-bit brightness value from fin */
787 < COLOR  col;
786 > static int
787 > getbword(               /* get a 16-bit brightness value from fin */
788 >        COLOR  col
789 > )
790   {
791          uint16  vw;
792          double  d;
# Line 759 | Line 801 | COLOR  col;
801   }
802  
803  
804 < putcascii(col)                  /* put an ascii color to stdout */
805 < COLOR  col;
804 > static int
805 > putcascii(                      /* put an ascii color to stdout */
806 >        COLOR  col
807 > )
808   {
809          fprintf(stdout, "%15.3e %15.3e %15.3e\n",
810                          colval(col,ord[0]),
# Line 771 | Line 815 | COLOR  col;
815   }
816  
817  
818 < putcfloat(col)                  /* put a float color to stdout */
819 < COLOR  col;
818 > static int
819 > putcfloat(                      /* put a float color to stdout */
820 >        COLOR  col
821 > )
822   {
823          float  vf[3];
824  
# Line 787 | Line 833 | COLOR  col;
833   }
834  
835  
836 < putcdouble(col)                 /* put a double color to stdout */
837 < COLOR  col;
836 > static int
837 > putcdouble(                     /* put a double color to stdout */
838 >        COLOR  col
839 > )
840   {
841          double  vd[3];
842  
# Line 803 | Line 851 | COLOR  col;
851   }
852  
853  
854 < putcint(col)                    /* put an int color to stdout */
855 < COLOR  col;
854 > static int
855 > putcint(                        /* put an int color to stdout */
856 >        COLOR  col
857 > )
858   {
859          fprintf(stdout, "%d %d %d\n",
860                          (int)(colval(col,ord[0])*256.),
# Line 815 | Line 865 | COLOR  col;
865   }
866  
867  
868 < putcbyte(col)                   /* put a byte color to stdout */
869 < COLOR  col;
868 > static int
869 > putcbyte(                       /* put a byte color to stdout */
870 >        COLOR  col
871 > )
872   {
873          long  i;
874          BYTE  vb[3];
# Line 833 | Line 885 | COLOR  col;
885   }
886  
887  
888 < putcword(col)                   /* put a 16-bit color to stdout */
889 < COLOR  col;
888 > static int
889 > putcword(                       /* put a 16-bit color to stdout */
890 >        COLOR  col
891 > )
892   {
893          long  i;
894          uint16  vw[3];
# Line 853 | Line 907 | COLOR  col;
907   }
908  
909  
910 < putbascii(col)                  /* put an ascii brightness to stdout */
911 < COLOR  col;
910 > static int
911 > putbascii(                      /* put an ascii brightness to stdout */
912 >        COLOR  col
913 > )
914   {
915          fprintf(stdout, "%15.3e\n", (*mybright)(col));
916  
# Line 862 | Line 918 | COLOR  col;
918   }
919  
920  
921 < putbfloat(col)                  /* put a float brightness to stdout */
922 < COLOR  col;
921 > static int
922 > putbfloat(                      /* put a float brightness to stdout */
923 >        COLOR  col
924 > )
925   {
926          float  vf;
927  
# Line 876 | Line 934 | COLOR  col;
934   }
935  
936  
937 < putbdouble(col)                 /* put a double brightness to stdout */
938 < COLOR  col;
937 > static int
938 > putbdouble(                     /* put a double brightness to stdout */
939 >        COLOR  col
940 > )
941   {
942          double  vd;
943  
# Line 890 | Line 950 | COLOR  col;
950   }
951  
952  
953 < putbint(col)                    /* put an int brightness to stdout */
954 < COLOR  col;
953 > static int
954 > putbint(                        /* put an int brightness to stdout */
955 >        COLOR  col
956 > )
957   {
958          fprintf(stdout, "%d\n", (int)((*mybright)(col)*256.));
959  
# Line 899 | Line 961 | COLOR  col;
961   }
962  
963  
964 < putbbyte(col)                   /* put a byte brightness to stdout */
965 < COLOR  col;
964 > static int
965 > putbbyte(                       /* put a byte brightness to stdout */
966 >        COLOR  col
967 > )
968   {
969          register int  i;
970          BYTE  vb;
# Line 913 | Line 977 | COLOR  col;
977   }
978  
979  
980 < putbword(col)                   /* put a 16-bit brightness to stdout */
981 < COLOR  col;
980 > static int
981 > putbword(                       /* put a 16-bit brightness to stdout */
982 >        COLOR  col
983 > )
984   {
985          long  i;
986          uint16  vw;
# Line 929 | Line 995 | COLOR  col;
995   }
996  
997  
998 < putpascii(col)                  /* put an ascii primary to stdout */
999 < COLOR  col;
998 > static int
999 > putpascii(                      /* put an ascii primary to stdout */
1000 >        COLOR  col
1001 > )
1002   {
1003          fprintf(stdout, "%15.3e\n", colval(col,putprim));
1004  
# Line 938 | Line 1006 | COLOR  col;
1006   }
1007  
1008  
1009 < putpfloat(col)                  /* put a float primary to stdout */
1010 < COLOR  col;
1009 > static int
1010 > putpfloat(                      /* put a float primary to stdout */
1011 >        COLOR  col
1012 > )
1013   {
1014          float  vf;
1015  
# Line 952 | Line 1022 | COLOR  col;
1022   }
1023  
1024  
1025 < putpdouble(col)                 /* put a double primary to stdout */
1026 < COLOR  col;
1025 > static int
1026 > putpdouble(                     /* put a double primary to stdout */
1027 >        COLOR  col
1028 > )
1029   {
1030          double  vd;
1031  
# Line 966 | Line 1038 | COLOR  col;
1038   }
1039  
1040  
1041 < putpint(col)                    /* put an int primary to stdout */
1042 < COLOR  col;
1041 > static int
1042 > putpint(                        /* put an int primary to stdout */
1043 >        COLOR  col
1044 > )
1045   {
1046          fprintf(stdout, "%d\n", (int)(colval(col,putprim)*256.));
1047  
# Line 975 | Line 1049 | COLOR  col;
1049   }
1050  
1051  
1052 < putpbyte(col)                   /* put a byte primary to stdout */
1053 < COLOR  col;
1052 > static int
1053 > putpbyte(                       /* put a byte primary to stdout */
1054 >        COLOR  col
1055 > )
1056   {
1057          long  i;
1058          BYTE  vb;
# Line 989 | Line 1065 | COLOR  col;
1065   }
1066  
1067  
1068 < putpword(col)                   /* put a 16-bit primary to stdout */
1069 < COLOR  col;
1068 > static int
1069 > putpword(                       /* put a 16-bit primary to stdout */
1070 >        COLOR  col
1071 > )
1072   {
1073          long  i;
1074          uint16  vw;
# Line 1005 | Line 1083 | COLOR  col;
1083   }
1084  
1085  
1086 < set_io()                        /* set put and get functions */
1086 > static void
1087 > set_io(void)                    /* set put and get functions */
1088   {
1089          switch (format) {
1090          case 'a':                                       /* ascii */
# Line 1133 | Line 1212 | set_io()                       /* set put and get functions */
1212                  }
1213                  return;
1214          }
1215 < badopt:
1215 > /* badopt: */ /* label not used */
1216          fprintf(stderr, "%s: botched file type\n", progname);
1217          quit(1);
1218   namerr:

Diff Legend

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