This patch adds rasters to the idraw output format of pstoedit.  It
adds an Image::writeIdrawImage method that gets used by a new
drvIDRAW::show_image method.
 
To apply this patch, cd to the top-level directory of an unpacked
pstoedit source distribution, then type:

	patch <ThisFile

If your copy of patch has problems finding the files, ^C out, then cd
to the src directory, and try this:

	patch -p1 <ThisFile

This patch was made from pstoedit-3.14 and tested on pstoedit-3.15.

Scott Johnston
Vectaport Inc.

November 11, 1999

Index: src/drvbase.cpp
diff -c src/drvbase.cpp:1.1 src/drvbase.cpp:1.3
*** src/drvbase.cpp:1.1	Wed Oct  6 10:32:29 1999
--- src/drvbase.cpp	Tue Nov  9 11:34:15 1999
***************
*** 1034,1039 ****
--- 1034,1153 ----
  }
  
  
+ void Image::writeIdrawImage(ostream & outi, float scalefactor) const
+ {
+     /* scale raster transformer by a ps-to-idraw factor */
+     /* translate the raster transformer to zero out x,y center of the raster */
+     /* then flip images vertically by multiplying transformer */
+     /* by a vertical inverting affine transform of 1,0,0,-1,0,0 */
+     /* then add the original offset back in */
+     float scaledMatrix[6];
+     float finalMatrix[6];
+     for (unsigned int i = 0 ; i < 6 ; i++ ) {
+       scaledMatrix[i] = normalizedImageCurrentMatrix[i] * scalefactor;
+       finalMatrix[i] = scaledMatrix[i]; // initial value
+     }
+ 
+     /* compute the scaled, transformed center and subtract it out. */
+     int mat00 = 0, mat01 = 1, mat10 = 2, mat11 = 3, mat20 = 4, mat21 = 5;
+     float centerx = width/2;
+     float centery = height/2;
+     float ncx = centerx*scaledMatrix[mat00] + centery*scaledMatrix[mat10] + scaledMatrix[mat20];
+     float ncy = centerx*scaledMatrix[mat01] + centery*scaledMatrix[mat11] + scaledMatrix[mat21];
+     finalMatrix[4] -= ncx;
+     finalMatrix[5] -= ncy;
+     
+     float verticalInvertingMatrix[6] = { 1, 0, 0, -1, 0, 0 };
+     float tmp = finalMatrix[mat00]*verticalInvertingMatrix[mat01] + finalMatrix[mat01]*verticalInvertingMatrix[mat11];
+     finalMatrix[mat00] = finalMatrix[mat00]*verticalInvertingMatrix[mat00] + finalMatrix[mat01]*verticalInvertingMatrix[mat10];
+     finalMatrix[mat01] = tmp;
+ 
+     tmp = finalMatrix[mat10]*verticalInvertingMatrix[mat01] + finalMatrix[mat11]*verticalInvertingMatrix[mat11];
+     finalMatrix[mat10] = finalMatrix[mat10]*verticalInvertingMatrix[mat00] + finalMatrix[mat11]*verticalInvertingMatrix[mat10];
+     finalMatrix[mat11] = tmp;
+ 
+     tmp = finalMatrix[mat20]*verticalInvertingMatrix[mat01] + finalMatrix[mat21]*verticalInvertingMatrix[mat11];
+     finalMatrix[mat20] = finalMatrix[mat20]*verticalInvertingMatrix[mat00] + finalMatrix[mat21]*verticalInvertingMatrix[mat10];
+     finalMatrix[mat21] = tmp;
+ 
+     finalMatrix[mat20] += verticalInvertingMatrix[mat20] + ncx;
+     finalMatrix[mat21] += verticalInvertingMatrix[mat21] + ncy;
+ 
+     // output the image data along with decoding procedure
+     // into a separate *.eps file
+     outi << "Begin %I Rast" << endl;
+     outi << "%I t" <<  endl;
+     outi << "[ " ;
+     outi << finalMatrix[0] << " ";
+     outi << finalMatrix[1] << " ";
+     outi << finalMatrix[2] << " ";
+     outi << finalMatrix[3] << " ";
+     outi << finalMatrix[4] << " ";
+     outi << finalMatrix[5] << " ";
+     outi << "] concat" << endl;
+     outi << "%I" << endl;
+     const int perline = width;
+ 
+ 	switch(type){
+ 	case colorimage:
+ 	  outi << width << " " << height << " " << bits << " Rast { currentfile " << perline << " string readhexstring pop }" << endl;
+ 		outi << "image";
+ 		{
+ 		int first = true;
+ 		for(unsigned int i=0; i<nextfreedataitem; i+=3){
+ 		  if(i%(perline*ncomp) == 0) {
+ 		    outi  << endl; // debug " " << i << endl;
+ 		    first = true;
+ 		  }
+ 		  if (first) {
+ 		    first = false;
+ 		    outi << "%I ";
+ 		  }
+ 		  outi << setw(2) << setfill('0') << hex << (int)data[i] << dec;
+ 		}}
+ 		outi << endl << "%I colorimage" ;
+ 		{
+ 		int first = true;
+ 		for(unsigned int i=0; i<nextfreedataitem; i++){
+ 		  if(i%(perline*ncomp) == 0) {
+ 		    outi  << endl; // debug " " << i << endl;
+ 		    first = true;
+ 		  }
+ 		  if (first) {
+ 		    first = false;
+ 		    outi << "%I ";
+ 		  }
+ 		  outi << setw(2) << setfill('0') << hex << (int)data[i] << dec;
+ 		}}
+ 		if (nextfreedataitem%(perline*ncomp) != 0) {
+ 		  for( unsigned int i = nextfreedataitem; i%(perline*ncomp) != 0; i++)  
+ 		    outi << setw(2) << setfill('0') << hex << 0 << dec;
+ 		}
+ 		break;
+     case imagemask:
+     // just treat it as a normal image for the moment
+     case normalimage:
+ 		outi << "/str1 1 string def" << endl << endl;
+ 		outi << "% display normal image" << endl;
+ 		outi << width << " " << height << " " << bits
+ 			 << " % width, height, bits/component" << endl;
+ 		outi << "% number of data " << nextfreedataitem << endl;
+ 		outi << "[ 1 0 0 1 0 0 ] %image matrix" << endl;
+ 		outi << "{currentfile str1 readhexstring pop} % decoding procedure" << endl;
+ 		outi << "image" << endl;
+ 		{for(unsigned int i=0; i<nextfreedataitem; i++){
+ 			if(i%(12*3) == 0) outi << endl;
+ 			outi << setw(2) << setfill('0') << hex << (unsigned int)data[i] << dec;
+ 		}}
+ 		break;
+     default:
+ 		break;
+     }
+ 
+     outi << endl << "End " << endl << endl;
+ }
+ 
+ 
  
  
  DriverDescription::DriverDescription(const char * s_name, 
Index: src/drvidraw.cpp
diff -c src/drvidraw.cpp:1.1 src/drvidraw.cpp:1.2
*** src/drvidraw.cpp:1.1	Wed Oct  6 10:32:29 1999
--- src/drvidraw.cpp	Mon Nov  8 16:24:12 1999
***************
*** 59,66 ****
                  1   // if backend supports elements with fill and edges
  			)
  #endif
! 			constructBase
! 
  {
    IDRAW_SCALING = 0.799705f * scalefactor_p;
    // Initialize the color table
--- 59,67 ----
                  1   // if backend supports elements with fill and edges
  			)
  #endif
! 			constructBase,
!                         buffer(tempFile.asOutput()),
! 	                imgcount(1)
  {
    IDRAW_SCALING = 0.799705f * scalefactor_p;
    // Initialize the color table
***************
*** 1013,1018 ****
--- 1014,1029 ----
  show_path();
  }
  
+ void drvIDRAW::show_image(const Image & imageinfo)
+ {
+     if(outDirName == NULL || outBaseName == NULL) {
+ 	errf << "images cannot be handled via standard output. Use an output file " << endl;
+     	return;
+     }
+ 
+     imageinfo.writeIdrawImage(outf, 1.0/IDRAW_SCALING);
+ }
+ 
  static DriverDescriptionT<drvIDRAW> D_idraw(
  		"idraw","Interviews draw format","idraw",
  		false, // if backend supports subpathes, else 0
***************
*** 1032,1038 ****
  		true, // if backend supports curves, else 0
  		true, // if backend supports elements with fill and edges
  		true, // if backend supports text, else 0
! 		false, // if backend supports Images
  		DriverDescription::normalopen,
  		false); // if format supports multiple pages in one file
   
--- 1043,1049 ----
  		true, // if backend supports curves, else 0
  		true, // if backend supports elements with fill and edges
  		true, // if backend supports text, else 0
! 		true, // if backend supports Images
  		DriverDescription::normalopen,
  		false); // if format supports multiple pages in one file
   
Index: src/drvidraw.h
diff -c src/drvidraw.h:1.1 src/drvidraw.h:1.2
*** src/drvidraw.h:1.1	Wed Oct  6 10:32:29 1999
--- src/drvidraw.h	Mon Nov  8 16:24:12 1999
***************
*** 52,59 ****
--- 52,67 ----
      return (unsigned int) (invalue/IDRAW_SCALING + 0.5);
    }
  
+ private:
+ 
+ 	int	      objectId;
+ 	TempFile      tempFile;
+ 	ofstream      &buffer;
+ 	int	      imgcount;
+ 
  #include "drvfuncs.h"
  
+ 	void show_image(const Image & imageinfo);
  };
  
  #endif
Index: src/image.h
diff -c src/image.h:1.1 src/image.h:1.2
*** src/image.h:1.1	Wed Oct  6 10:32:32 1999
--- src/image.h	Mon Nov  8 16:24:12 1999
***************
*** 47,52 ****
--- 47,53 ----
  		}
  	~Image() { delete [] data; data = 0; nextfreedataitem = 0;}
  	void writeEPSImage(ostream & outi) const;
+ 	void writeIdrawImage(ostream & outi, float scalefactor) const;
  	void getBoundingBox(Point & ll_p, Point & ur_p) const
  		{ ll_p = ll; ur_p = ur; }
  	void calculateBoundingBox();