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

 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999, 2001  Guido Masarotto and the R Development Core Team
+ *  Copyright (C) 1999, 2001, 2004  Guido Masarotto and the R Development Core Team
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
 static void my_png_warning(png_structp png_ptr, png_const_charp msg)
+{
   warning("libpng: %s",(char *) msg);
+}
+#define CN (100.0/2.54)
 int R_SaveAsPng(void  *d, int width, int height,
 		unsigned long (*gp)(void *, int, int),
-		int bgr, FILE *fp, unsigned int transparent)
+		int bgr, FILE *fp, unsigned int transparent, int res)
+{
   png_structp png_ptr;
   png_infop info_ptr;
   unsigned long  col, palette[256];
   png_color pngpalette[256];
 	  trans_values[0].green = GETGREEN(transparent);
+      }
       png_set_tRNS(png_ptr, info_ptr, trans, ncols, trans_values);
+  }
+  if(res > 0)
+      png_set_pHYs(png_ptr, info_ptr, res/0.0254, res/0.0254,
+		   PNG_RESOLUTION_METER);
   /* Write the file header information.  REQUIRED */
   png_write_info(png_ptr, info_ptr);
   /*
    * Now, write the pixels
 int R_SaveAsJpeg(void  *d, int width, int height,
 		unsigned long (*gp)(void *, int, int),
-		int bgr, int quality, FILE *outfile)
+		int bgr, int quality, FILE *outfile, int res)
+{
   struct jpeg_compress_struct cinfo;
   struct my_error_mgr jerr;
   /* More stuff */
   JSAMPLE *pscanline, *scanline = calloc(3*width,sizeof(JSAMPLE));
   cinfo.image_width = width; 	/* image width and height, in pixels */
   cinfo.image_height = height;
   cinfo.input_components = 3;		/* # of color components per pixel */
   cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
   jpeg_set_defaults(&cinfo);
+  if(res > 0) {
+      cinfo.density_unit = 1;  /* pixels per inch */
+      cinfo.X_density = res;
+      cinfo.Y_density = res;
+  }
   jpeg_set_quality(&cinfo, quality, TRUE);
   /* Step 4: Start compressor */
   jpeg_start_compress(&cinfo, TRUE);
   /* Step 5: while (scan lines remain to be written) */
 #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
 int R_SaveAsBmp(void  *d, int width, int height,
-		unsigned long (*gp)(void *, int, int), int bgr, FILE *fp)
+		unsigned long (*gp)(void *, int, int), int bgr, FILE *fp,
+		int res)
+{
   unsigned long  col, palette[256];
   int i, j, r, ncols, mid, high, low, withpalette;
   int bfOffBits, bfSize, biBitCount, biClrUsed , pad;
   unsigned short wrd;
   unsigned long dwrd;
-  long lng;
+  long lng, lres;
   DECLARESHIFTS;
   /* Have we less than 256 different colors? */
   ncols = mid = 0;
   withpalette = 1;
   BMPLONG(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);
-  BMPLONG(0); /* XPels/M <- used only by Windows?*/
+  BMPLONG(lres); /* XPels/M <- used only by Windows?*/
-  BMPLONG(0); /* XPels/M */
+  BMPLONG(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/djm-source/src/gnuwin32/bitmap/rbitmap.c @ 34412 – Rev 29864 → 30691