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

Comparing ray/src/common/bmpfile.c (file contents):
Revision 2.15 by greg, Tue May 10 01:08:43 2005 UTC vs.
Revision 2.16 by schorsch, Thu Mar 10 01:49:00 2016 UTC

# Line 548 | Line 548 | BMPmappedHeader(int xr, int yr, int infolen, int ncolo
548                  n = 8;
549          else
550                  return NULL;
551 +        /* XXX VC warns about 32 bit shift coerced to 64 bit */
552          hdr = (BMPHeader *)malloc(sizeof(BMPHeader) +
553                                          sizeof(RGBquad)*(1<<n) -
554                                          sizeof(hdr->palette) +
# Line 563 | Line 564 | BMPmappedHeader(int xr, int yr, int infolen, int ncolo
564          hdr->nColors = ncolors;
565          hdr->impColors = 0;                     /* says all colors important */
566          hdr->infoSiz = infolen;
567 +        /* XXX VC warns about 32 bit shift coerced to 64 bit */
568          memset((void *)hdr->palette, 0, sizeof(RGBquad)*(1<<n) + infolen);
569          for (n = ncolors; n--; )
570                  hdr->palette[n].r = hdr->palette[n].g =

Diff Legend

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