7 |
|
* Externals declared in resolu.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
/* ==================================================================== |
11 |
< |
* The Radiance Software License, Version 1.0 |
12 |
< |
* |
13 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
14 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
15 |
< |
* |
16 |
< |
* Redistribution and use in source and binary forms, with or without |
17 |
< |
* modification, are permitted provided that the following conditions |
18 |
< |
* are met: |
19 |
< |
* |
20 |
< |
* 1. Redistributions of source code must retain the above copyright |
21 |
< |
* notice, this list of conditions and the following disclaimer. |
22 |
< |
* |
23 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
24 |
< |
* notice, this list of conditions and the following disclaimer in |
25 |
< |
* the documentation and/or other materials provided with the |
26 |
< |
* distribution. |
27 |
< |
* |
28 |
< |
* 3. The end-user documentation included with the redistribution, |
29 |
< |
* if any, must include the following acknowledgment: |
30 |
< |
* "This product includes Radiance software |
31 |
< |
* (http://radsite.lbl.gov/) |
32 |
< |
* developed by the Lawrence Berkeley National Laboratory |
33 |
< |
* (http://www.lbl.gov/)." |
34 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
35 |
< |
* if and wherever such third-party acknowledgments normally appear. |
36 |
< |
* |
37 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
38 |
< |
* and "The Regents of the University of California" must |
39 |
< |
* not be used to endorse or promote products derived from this |
40 |
< |
* software without prior written permission. For written |
41 |
< |
* permission, please contact [email protected]. |
42 |
< |
* |
43 |
< |
* 5. Products derived from this software may not be called "Radiance", |
44 |
< |
* nor may "Radiance" appear in their name, without prior written |
45 |
< |
* permission of Lawrence Berkeley National Laboratory. |
46 |
< |
* |
47 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
48 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
49 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
50 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
51 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
52 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
53 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
54 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
55 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
56 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
57 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
58 |
< |
* SUCH DAMAGE. |
59 |
< |
* ==================================================================== |
60 |
< |
* |
61 |
< |
* This software consists of voluntary contributions made by many |
62 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
63 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
64 |
< |
* <http://www.lbl.gov/>. |
65 |
< |
*/ |
10 |
> |
#include "copyright.h" |
11 |
|
|
67 |
– |
#include <stdio.h> |
12 |
|
#include <stdlib.h> |
13 |
< |
#include <time.h> |
13 |
> |
#include <stdio.h> |
14 |
|
|
15 |
|
#include "resolu.h" |
16 |
|
|
19 |
|
|
20 |
|
|
21 |
|
void |
22 |
< |
fputresolu(ord, sl, ns, fp) /* put out picture dimensions */ |
23 |
< |
int ord; /* scanline ordering */ |
24 |
< |
int sl, ns; /* scanline length and number */ |
25 |
< |
FILE *fp; |
22 |
> |
fputresolu( /* put out picture dimensions */ |
23 |
> |
int ord, /* scanline ordering */ |
24 |
> |
int sl, int ns, /* scanline length and number */ |
25 |
> |
FILE *fp |
26 |
> |
) |
27 |
|
{ |
28 |
|
RESOLU rs; |
29 |
|
|
39 |
|
|
40 |
|
|
41 |
|
int |
42 |
< |
fgetresolu(sl, ns, fp) /* get picture dimensions */ |
43 |
< |
int *sl, *ns; /* scanline length and number */ |
44 |
< |
FILE *fp; |
42 |
> |
fgetresolu( /* get picture dimensions */ |
43 |
> |
int *sl, int *ns, /* scanline length and number */ |
44 |
> |
FILE *fp |
45 |
> |
) |
46 |
|
{ |
47 |
|
RESOLU rs; |
48 |
|
|
60 |
|
|
61 |
|
|
62 |
|
char * |
63 |
< |
resolu2str(buf, rp) /* convert resolution struct to line */ |
64 |
< |
char *buf; |
65 |
< |
register RESOLU *rp; |
63 |
> |
resolu2str( /* convert resolution struct to line */ |
64 |
> |
char *buf, |
65 |
> |
RESOLU *rp |
66 |
> |
) |
67 |
|
{ |
68 |
|
if (rp->rt&YMAJOR) |
69 |
< |
sprintf(buf, "%cY %d %cX %d\n", |
69 |
> |
sprintf(buf, "%cY %8d %cX %8d\n", |
70 |
|
rp->rt&YDECR ? '-' : '+', rp->yr, |
71 |
|
rp->rt&XDECR ? '-' : '+', rp->xr); |
72 |
|
else |
73 |
< |
sprintf(buf, "%cX %d %cY %d\n", |
73 |
> |
sprintf(buf, "%cX %8d %cY %8d\n", |
74 |
|
rp->rt&XDECR ? '-' : '+', rp->xr, |
75 |
|
rp->rt&YDECR ? '-' : '+', rp->yr); |
76 |
|
return(buf); |
78 |
|
|
79 |
|
|
80 |
|
int |
81 |
< |
str2resolu(rp, buf) /* convert resolution line to struct */ |
82 |
< |
register RESOLU *rp; |
83 |
< |
char *buf; |
81 |
> |
str2resolu( /* convert resolution line to struct */ |
82 |
> |
RESOLU *rp, |
83 |
> |
char *buf |
84 |
> |
) |
85 |
|
{ |
86 |
< |
register char *xndx, *yndx; |
87 |
< |
register char *cp; |
86 |
> |
char *xndx, *yndx; |
87 |
> |
char *cp; |
88 |
|
|
89 |
|
if (buf == NULL) |
90 |
|
return(0); |