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.18 by greg, Fri May 3 09:49:02 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 658 | Line 658 | COLR  *scan;
658          register int    x, xi;
659  
660          if (iconheight == 0) {          /* initialize */
661 <                if (xmax < ICONSIZ && ymax < ICONSIZ) {
661 >                if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
662                          iconwidth = xmax;
663                          iconheight = ymax;
664                  } else if (xmax > ymax) {
# Line 686 | Line 686 | COLR  *scan;
686                          *dp |= 1<<(x&07);
687                  cerr[x] = err >>= 1;
688          }
689 <        if (y >= ymax-ymax/iconheight)  /* all done */
689 >        if (y >= ymax - ymax/iconheight)        /* all done */
690                  dp = NULL;
691   }
692  

Diff Legend

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