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

Comparing ray/src/px/x11image.c (file contents):
Revision 1.19 by greg, Fri May 3 09:54:31 1991 UTC vs.
Revision 1.22 by greg, Fri May 3 13:28:39 1991 UTC

# Line 248 | Line 248 | init()                 /* get data and open window */
248          XSetFunction(thedisplay, revgc, GXinvert);
249          XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay,
250                          XC_diamond_cross));
251 +        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
252          if (geometry != NULL) {
253                  bzero((char *)&oursizhints, sizeof(oursizhints));
254                  i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
# Line 280 | Line 281 | init()                 /* get data and open window */
281                          |ButtonMotionMask|StructureNotifyMask
282                          |KeyPressMask|ExposureMask);
283          XMapWindow(thedisplay, wind);
283 –                                /* store name last as ready signal */
284 –        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
284          return;
285   memerr:
286          quiterr("out of memory");
# Line 653 | Line 652 | add2icon(y, scan)              /* add a scanline to our icon data
652   int  y;
653   COLR  *scan;
654   {
656 –        static char  *dp = NULL;
655          static short  cerr[ICONSIZ];
656 +        static int  ynext;
657 +        static char  *dp;
658          register int  err;
659 <        register int    x, xi;
659 >        register int    x, ti;
660  
661          if (iconheight == 0) {          /* initialize */
662                  if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
# Line 669 | Line 669 | COLR  *scan;
669                          iconwidth = ICONSIZ*xmax/ymax;
670                          iconheight = ICONSIZ;
671                  }
672 +                ynext = 0;
673                  dp = icondata - 1;
674          }
675 <        if (dp == NULL)                 /* done already */
675 >        if (y < ynext*ymax/iconheight)  /* skip this one */
676                  return;
676 –        if (y % (ymax/iconheight))      /* skip this one */
677 –                return;
677          err = 0;
678          for (x = 0; x < iconwidth; x++) {
679                  if (!(x&7))
680                          *++dp = 0;
681 <                xi = x*xmax/iconwidth;
682 <                err += normbright(scan[xi]) + cerr[x];
681 >                ti = x*xmax/iconwidth;
682 >                err += normbright(scan[ti]) + cerr[x];
683                  if (err > 127)
684                          err -= 255;
685                  else
686                          *dp |= 1<<(x&07);
687                  cerr[x] = err >>= 1;
688          }
689 <        if (y >= ymax - ymax/iconheight)        /* all done */
691 <                dp = NULL;
689 >        ynext++;
690   }
691  
692  

Diff Legend

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