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

Comparing src/px/macbethcal.c (file contents):
Revision 2.16 by gwlarson, Fri Jul 16 16:12:20 1999 UTC vs.
Revision 2.17 by greg, Sat Feb 22 02:07:27 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1999 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Calibrate a scanned MacBeth Color Checker Chart
6   *
# Line 18 | Line 15 | static char SCCSid[] = "$SunId$ SGI";
15   #ifdef MSDOS
16   #include <fcntl.h>
17   #endif
18 + #include  <time.h>
19   #include "color.h"
20   #include "resolu.h"
21   #include "pmap.h"
# Line 125 | Line 123 | WARP3D *wcor = NULL;           /* color space warp */
123   FILE    *debugfp = NULL;        /* debug output picture */
124   char    *progname;
125  
128 – extern char     *malloc();
126  
130 –
127   main(argc, argv)
128   int     argc;
129   char    **argv;
# Line 362 | Line 358 | getpicture()                           /* load in picture colors */
358                  scalecolor(inpRGB[i], d);
359                  inpflags |= 1L<<i;
360          }
361 <        free((char *)scanln);
361 >        free((void *)scanln);
362   }
363  
364  
# Line 712 | Line 708 | picdebug()                     /* put out debugging picture */
708          }
709                                                  /* clean up */
710          fclose(debugfp);
711 <        free((char *)scan);
711 >        free((void *)scan);
712   }
713  
714  
# Line 782 | Line 778 | clrdebug()                     /* put out debug picture from color input
778          }
779                                                  /* clean up */
780          fclose(debugfp);
781 <        free((char *)scan);
781 >        free((void *)scan);
782   }
783  
784  

Diff Legend

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