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.17 by greg, Thu May 2 17:24:54 1991 UTC vs.
Revision 1.20 by greg, Fri May 3 10:54:47 1991 UTC

# Line 37 | Line 37 | static char SCCSid[] = "$SunId$ LBL";
37  
38   #define  BORWIDTH       5               /* border width */
39  
40 < #define  ICONSIZ        80              /* maximum icon dimension */
40 > #define  ICONSIZ        (8*10)          /* maximum icon dimension (even 8) */
41  
42   #define  ourscreen      DefaultScreen(thedisplay)
43   #define  ourblack       BlackPixel(thedisplay,ourscreen)
# Line 92 | Line 92 | struct {
92  
93   char  *geometry = NULL;                 /* geometry specification */
94  
95 < char  icondata[(ICONSIZ+7)/8*ICONSIZ];  /* icon bitmap data */
95 > char  icondata[ICONSIZ*ICONSIZ/8];      /* icon bitmap data */
96   int  iconwidth = 0, iconheight = 0;
97  
98   char  *progname;
# Line 246 | Line 246 | init()                 /* get data and open window */
246          XSetFont(thedisplay, ourgc, fontid);
247          revgc = XCreateGC(thedisplay, wind, 0, 0);
248          XSetFunction(thedisplay, revgc, GXinvert);
249 –        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
249          XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay,
250                          XC_diamond_cross));
251          if (geometry != NULL) {
# Line 281 | Line 280 | init()                 /* get data and open window */
280                          |ButtonMotionMask|StructureNotifyMask
281                          |KeyPressMask|ExposureMask);
282          XMapWindow(thedisplay, wind);
283 +                                /* store name last as ready signal */
284 +        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
285          return;
286   memerr:
287          quiterr("out of memory");
# Line 652 | Line 653 | add2icon(y, scan)              /* add a scanline to our icon data
653   int  y;
654   COLR  *scan;
655   {
655 –        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) {
663 >                if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
664                          iconwidth = xmax;
665                          iconheight = ymax;
666                  } else if (xmax > ymax) {
# Line 668 | 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;
675 –        if (y % (ymax/iconheight))      /* skip this one */
676 –                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 */
690 <                dp = NULL;
690 >        ynext++;
691   }
692  
693  

Diff Legend

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