The R Project SVN – R – Diff – /branches/R-classInheritance/src/gnuwin32/bitmap/rbitmap.c

 */
 #define BMPERROR {R_ShowMessage("Problems writing to 'bmp' file");return 0;}
 #define BMPW(a) {wrd=a;if(fwrite(&wrd,sizeof(unsigned short),1,fp)!=1) BMPERROR}
 #define BMPDW(a) {dwrd=a;if(fwrite(&dwrd,sizeof(unsigned int),1,fp)!=1) BMPERROR}
-#define BMPLONG(a) {lng=a;if(fwrite(&lng,sizeof(long),1,fp)!=1) BMPERROR}
 #define BMPPUTC(a) if(fputc(a,fp)==EOF) BMPERROR;
 #define HEADERSIZE 54
 __declspec(dllexport)
 int R_SaveAsBmp(void  *d, int width, int height,
     unsigned int  col, palette[256];
     int i, j, r, ncols, mid, high, low, withpalette;
     int bfOffBits, bfSize, biBitCount, biClrUsed , pad;
     unsigned short wrd;
     unsigned int dwrd;
-    long lng, lres;
+    int lres;
     DECLARESHIFTS;
     /* Have we less than 256 different colors? */
     ncols = mid = 0;
     withpalette = 1;
 	biBitCount = 24;
 	biClrUsed = 0;
+    }
     /* write the header */
-    BMPW(0x4D42); /* bfType must be "BM" */
+    BMPPUTC('B');BMPPUTC('M');
     BMPDW(bfSize); /*bfSize*/
     BMPW(0);BMPW(0); /* bfReserved1 and bfReserved2 must be 0*/
     BMPDW(bfOffBits); /* bfOffBits */
-    BMPDW(40);	/* biSize */
+    BMPDW(40);	/* Windows V3. size 40 bytes */
-    BMPLONG(width); /* biWidth */
+    BMPDW(width); /* biWidth */
-    BMPLONG(height); /* biHeight */
+    BMPDW(height); /* biHeight */
     BMPW(1);	/* biPlanes - must be 1 */
     BMPW(biBitCount); /* biBitCount */
     BMPDW(0); /* biCompression=BI_RGB */
     BMPDW(0); /* biSizeImage (with BI_RGB not needed)*/
-    lres = (long)(0.5 + res/0.0254);
+    lres = (int)(0.5 + res/0.0254);
-    BMPLONG(lres); /* XPels/M <- used only by Windows?*/
+    BMPDW(lres); /* XPels/M */
-    BMPLONG(lres); /* XPels/M */
+    BMPDW(lres); /* XPels/M */
     BMPDW(biClrUsed); /* biClrUsed */
     BMPDW(0) ; /* biClrImportant All colours are important */
     /* and now the image */
     if (withpalette) {

The R Project SVN R

(root)/branches/R-classInheritance/src/gnuwin32/bitmap/rbitmap.c @ 63243 – Rev 44594 → 44641