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

Comparing ray/src/px/x11raster.c (file contents):
Revision 2.12 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 2.13 by schorsch, Sun Mar 28 20:33:14 2004 UTC

# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   #include "x11raster.h"
16  
17  
18 < XRASTER *
19 < make_raster(disp, vis, npixbits, data, width, height, bm_pad)
20 < Display *disp;
21 < XVisualInfo     *vis;
22 < int     npixbits;
23 < char    *data;
24 < int     width, height;
25 < int     bm_pad;
18 > extern XRASTER *
19 > make_raster(
20 >        Display *disp,
21 >        XVisualInfo     *vis,
22 >        int     npixbits,
23 >        char    *data,
24 >        int     width,
25 >        int height,
26 >        int     bm_pad
27 > )
28   {
29          static long     swaptest = 1;
30          register XRASTER        *xr;
# Line 56 | Line 58 | int    bm_pad;
58   }
59  
60  
61 < int
62 < init_rcolors(xr, cmap)                  /* initialize colors */
63 < register XRASTER        *xr;
64 < BYTE    cmap[][3];
61 > extern int
62 > init_rcolors(                   /* initialize colors */
63 >        register XRASTER        *xr,
64 >        BYTE    cmap[][3]
65 > )
66   {
67          register unsigned char  *p;
68          register int    i;
# Line 93 | Line 96 | BYTE   cmap[][3];
96   }
97  
98  
99 < Colormap
100 < newcmap(disp, scrn, vis)                /* get colormap and fix b & w */
101 < Display *disp;
102 < int     scrn;
103 < Visual  *vis;
99 > extern Colormap
100 > newcmap(                /* get colormap and fix b & w */
101 >        Display *disp,
102 >        int     scrn,
103 >        Visual  *vis
104 > )
105   {
106          XColor  thiscolor;
107          unsigned long   *pixels;
# Line 136 | Line 140 | Visual *vis;
140   }
141  
142  
143 < unsigned long *
144 < map_rcolors(xr, w)                      /* get and assign pixels */
145 < register XRASTER        *xr;
146 < Window  w;
143 > extern unsigned long *
144 > map_rcolors(                    /* get and assign pixels */
145 >        register XRASTER        *xr,
146 >        Window  w
147 > )
148   {
149          register int    i;
150          register unsigned char  *p;
# Line 186 | Line 191 | Window w;
191   }
192  
193  
194 < Pixmap
195 < make_rpixmap(xr, w)                     /* make pixmap for raster */
196 < register XRASTER        *xr;
197 < Window  w;
194 > extern Pixmap
195 > make_rpixmap(                   /* make pixmap for raster */
196 >        register XRASTER        *xr,
197 >        Window  w
198 > )
199   {
200          XWindowAttributes       xwattr;
201          Pixmap  pm;
# Line 206 | Line 212 | Window w;
212          return(xr->pm = pm);
213   }
214  
215 <
216 < patch_raster(d, xsrc, ysrc, xdst, ydst, width, height, xr)      /* redraw */
217 < Drawable        d;
218 < int     xsrc, ysrc, xdst, ydst;
219 < int     width, height;
220 < register XRASTER        *xr;
215 > extern void
216 > patch_raster(   /* redraw */
217 >        Drawable        d,
218 >        int     xsrc,
219 >        int     ysrc,
220 >        int     xdst,
221 >        int     ydst,
222 >        int     width,
223 >        int     height,
224 >        register XRASTER        *xr
225 > )
226   {
227          if (xsrc >= xr->image->width || ysrc >= xr->image->height)
228                  return;
# Line 244 | Line 255 | register XRASTER       *xr;
255   }
256  
257  
258 < unmap_rcolors(xr)                       /* free colors */
259 < register XRASTER        *xr;
258 > extern void
259 > unmap_rcolors(                  /* free colors */
260 >        register XRASTER        *xr
261 > )
262   {
263          if (xr->pixels == NULL)
264                  return;
# Line 257 | Line 270 | register XRASTER       *xr;
270   }
271  
272  
273 < free_rpixmap(xr)                        /* release Pixmap */
274 < register XRASTER        *xr;
273 > extern void
274 > free_rpixmap(                   /* release Pixmap */
275 >        register XRASTER        *xr
276 > )
277   {
278          if (xr->pm == 0)
279                  return;
# Line 267 | Line 282 | register XRASTER       *xr;
282   }
283  
284  
285 < free_raster(xr)                         /* free raster data */
286 < register XRASTER        *xr;
285 > extern void
286 > free_raster(                            /* free raster data */
287 >        register XRASTER        *xr
288 > )
289   {
290          free_rpixmap(xr);
291          if (xr->ncolors > 0) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines