ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.20 by greg, Fri May 3 10:54:47 1991 UTC

# Line 653 | Line 653 | add2icon(y, scan)              /* add a scanline to our icon data
653   int  y;
654   COLR  *scan;
655   {
656 –        static char  *dp = NULL;
656          static short  cerr[ICONSIZ];
657 +        static int  ynext;
658 +        static char  *dp;
659          register int  err;
660 <        register int    x, xi;
660 >        register int    x, ti;
661  
662          if (iconheight == 0) {          /* initialize */
663                  if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
# Line 669 | Line 670 | COLR  *scan;
670                          iconwidth = ICONSIZ*xmax/ymax;
671                          iconheight = ICONSIZ;
672                  }
673 +                ynext = 0;
674                  dp = icondata - 1;
675          }
676 <        if (dp == NULL)                 /* done already */
676 >        if (y < ynext*ymax/iconheight)  /* skip this one */
677                  return;
676 –        if (y % (ymax/iconheight))      /* skip this one */
677 –                return;
678          err = 0;
679          for (x = 0; x < iconwidth; x++) {
680                  if (!(x&7))
681                          *++dp = 0;
682 <                xi = x*xmax/iconwidth;
683 <                err += normbright(scan[xi]) + cerr[x];
682 >                ti = x*xmax/iconwidth;
683 >                err += normbright(scan[ti]) + cerr[x];
684                  if (err > 127)
685                          err -= 255;
686                  else
687                          *dp |= 1<<(x&07);
688                  cerr[x] = err >>= 1;
689          }
690 <        if (y >= ymax - ymax/iconheight)        /* all done */
691 <                dp = NULL;
690 >        ynext++;
691   }
692  
693  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)