* generic/tkImage.c (Tk_PostscriptImage): added check to create

	necessary prolog for photos
	* generic/tkCanvPs.c: added Tk_PostscriptPhoto that outputs PS for
	photo images
	* generic/tkImgPhoto.c: new func ImgPhotoPostscript and added that
	in as ps proc in tkPhotoImageType.
	* generic/tkStubInit.c:
	* generic/tkDecls.h:
	* generic/tk.decls: added Tk_PostscriptPhoto

7 files changed, 582 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d3cf02..7b4edc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2000-04-24  Jeff Hobbs  <hobbs@scriptics.com>
+
+	* generic/tkImage.c (Tk_PostscriptImage): added check to create
+	necessary prolog for photos
+	* generic/tkCanvPs.c: added Tk_PostscriptPhoto that outputs PS for
+	photo images
+	* generic/tkImgPhoto.c: new func ImgPhotoPostscript and added that
+	in as ps proc in tkPhotoImageType.
+	* generic/tkStubInit.c:
+	* generic/tkDecls.h:
+	* generic/tk.decls: added Tk_PostscriptPhoto
+
+	* generic/tkConfig.c (DoObjConfig): removed direct setting of
+	interp->result.
+
+	* mac/tkMacWm.c (Tk_WmCmd): initialized gotToplevel in
+	colormapwindows case (bug found by Reasoning, Inc's automated code
+	testing).
+
 2000-04-24  Eric Melski  <ericm@scriptics.com>
 
 	* unix/mkLinks: 
@@ -9,6 +28,22 @@
 	* unix/mkLinks: 
 	* doc/AddOption.3: Man page for Tk_AddOption [Bug: 1854]
 
+2000-04-22  Jim Ingham	<jingham@cygnus.com>
+
+	* mac/tkMacDialog.c (Tk_MacGetOpenFile): Add empty bodies for the 
+	"-initialfile" and "-defaultextension" options.
+
+	* mac/tkMacDialog.c (NavServicesGetFile): Only cons the result up
+	into a list if multiple is true.
+
+	* mac/tkMacMenus.c (SourceDialog): Use the "tk_getOpenFile"
+	instead of hand-coding the dialog with StandardGetFile.  This way
+	we get the Navigation dialogs for free.
+
+	* doc/getOpenFile.n: Document the -multiple and -message flags
+	which are only implemented on the Mac.  Also note that the -title
+	works on the Mac with Nav Services installed.
+
 2000-04-19  Eric Melski  <ericm@scriptics.com>
 
 	* doc/WinViewable.3: 
@@ -23,22 +58,6 @@
 	* generic/tk.decls: Removed Tk_IsViewable function (it was not
 	actually needed).
 
-2000-04-22  Jim Ingham  <jingham@cygnus.com>
-
-	* mac/tkMacDialog.c (Tk_MacGetOpenFile): Add empty bodies for the 
-	"-initialfile" and "-defaultextension" options.
-        
-	* mac/tkMacDialog.c (NavServicesGetFile): Only cons the result up into
-	a list if multiple is true.
-        
-	* mac/tkMacMenus.c (SourceDialog): Use the "tk_getOpenFile"
-	instead of hand-coding the dialog with StandardGetFile.  This way
-	we get the Navigation dialogs for free.
-	        
-	* doc/getOpenFile.n: Document the -multiple and -message flags
-	which are only implemented on the Mac.  Also note that the -title
-	works on the Mac wit Nav Services installed.
-        
 2000-04-19  Jeff Hobbs  <hobbs@scriptics.com>
 
 	* win/aclocal.m4: made SC_PROG_TCLSH search specifically for
diff --git a/generic/tk.decls b/generic/tk.decls
index d8584b3..d5af12a 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tk.decls,v 1.9 2000/04/19 23:11:23 ericm Exp $
+# RCS: @(#) $Id: tk.decls,v 1.10 2000/04/25 01:03:05 hobbs Exp $
 
 library tk
 
@@ -1120,6 +1120,11 @@ declare 236 generic {
 declare 237 generic {
     double Tk_PostscriptY (double y, Tk_PostscriptInfo psInfo)
 }
+declare 238 generic {
+    int	Tk_PostscriptPhoto (Tcl_Interp *interp, \
+	    Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, \
+	    int width, int height)
+}
 
 # Define the platform specific public Tk interface.  These functions are
 # only available on the designated platform.
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index c234320..940b754 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvPs.c,v 1.6 1999/12/14 06:52:26 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvPs.c,v 1.7 2000/04/25 01:03:06 hobbs Exp $
  */
 
 #include "tkInt.h"
@@ -128,7 +128,7 @@ static CONST char * CONST  prolog[]= {
 \n\
 % This is a standard prolog for Postscript generated by Tk's canvas\n\
 % widget.\n\
-% RCS: @(#) $Id: tkCanvPs.c,v 1.6 1999/12/14 06:52:26 hobbs Exp $\n\
+% RCS: @(#) $Id: tkCanvPs.c,v 1.7 2000/04/25 01:03:06 hobbs Exp $\n\
 \n\
 % The definitions below just define all of the variables used in\n\
 % any of the procedures here.  This is needed for obscure reasons\n\
@@ -1681,3 +1681,465 @@ TkPostscriptImage(interp, tkwin, psInfo, ximage, x, y, width, height)
     ckfree((char *) cdata.colors);
     return TCL_OK;
 }
+
+/*
+ *--------------------------------------------------------------
+ *
+ * Tk_PostscriptPhoto --
+ *
+ *	This procedure is called to output the contents of a
+ *	photo image in Postscript, using a format appropriate for
+ *	the requested postscript color mode (i.e. one byte per pixel
+ *	in gray, and three bytes per pixel in color).
+ *
+ * Results:
+ *	Returns a standard Tcl return value.  If an error occurs
+ *	then an error message will be left in interp->result.
+ *	If no error occurs, then additional Postscript will be
+ *	appended to the interpreter's result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *--------------------------------------------------------------
+ */
+int
+Tk_PostscriptPhoto(interp, blockPtr, psInfo, width, height)
+    Tcl_Interp *interp;
+    Tk_PhotoImageBlock *blockPtr;
+    Tk_PostscriptInfo psInfo;
+    int width, height;
+{
+    TkPostscriptInfo *psInfoPtr = (TkPostscriptInfo *) psInfo;
+    int colorLevel = psInfoPtr->colorLevel;
+    static int codeIncluded = 0;
+
+    unsigned char *pixelPtr;
+    char buffer[256], cspace[40], decode[40];
+    int bpc;
+    int xx, yy, lineLen;
+    float red, green, blue;
+    int alpha;
+    int bytesPerLine=0, maxWidth=0;
+
+    unsigned char opaque = 255;
+    unsigned char *alphaPtr;
+    int alphaOffset, alphaPitch, alphaIncr;
+
+    if (psInfoPtr->prepass) {
+	codeIncluded = 0;
+	return TCL_OK;
+    }
+
+    /*
+     * Define the "TkPhoto" function, which is a modified version
+     * of the original "transparentimage" function posted
+     * by ian@five-d.com (Ian Kemmish) to comp.lang.postscript.
+     * For a monochrome colorLevel this is a slightly different
+     * version that uses the imagemask command instead of image.
+     */
+
+    if( !codeIncluded && (colorLevel != 0) ) {
+	/*
+	 * Color and gray-scale code.
+	 */
+
+	codeIncluded = !0;
+	Tcl_AppendResult( interp,
+		"/TkPhoto { \n",
+		"  gsave \n",
+		"  32 dict begin \n",
+		"  /tinteger exch def \n",
+		"  /transparent 1 string def \n",
+		"  transparent 0 tinteger put \n",
+		"  /olddict exch def \n",
+		"  olddict /DataSource get dup type /filetype ne { \n",
+		"    olddict /DataSource 3 -1 roll \n",
+		"    0 () /SubFileDecode filter put \n",
+		"  } { \n",
+		"    pop \n",
+		"  } ifelse \n",
+		"  /newdict olddict maxlength dict def \n",
+		"  olddict newdict copy pop \n",
+		"  /w newdict /Width get def \n",
+		"  /crpp newdict /Decode get length 2 idiv def \n",
+		"  /str w string def \n",
+		"  /pix w crpp mul string def \n",
+		"  /substrlen 2 w log 2 log div floor exp cvi def \n",
+		"  /substrs [ \n",
+		"  { \n",
+		"     substrlen string \n",
+		"     0 1 substrlen 1 sub { \n",
+		"       1 index exch tinteger put \n",
+		"     } for \n",
+		"     /substrlen substrlen 2 idiv def \n",
+		"     substrlen 0 eq {exit} if \n",
+		"  } loop \n",
+		"  ] def \n",
+		"  /h newdict /Height get def \n",
+		"  1 w div 1 h div matrix scale \n",
+		"  olddict /ImageMatrix get exch matrix concatmatrix \n",
+		"  matrix invertmatrix concat \n",
+		"  newdict /Height 1 put \n",
+		"  newdict /DataSource pix put \n",
+		"  /mat [w 0 0 h 0 0] def \n",
+		"  newdict /ImageMatrix mat put \n",
+		"  0 1 h 1 sub { \n",
+		"    mat 5 3 -1 roll neg put \n",
+		"    olddict /DataSource get str readstring pop pop \n",
+		"    /tail str def \n",
+		"    /x 0 def \n",
+		"    olddict /DataSource get pix readstring pop pop \n",
+		"    { \n",
+		"      tail transparent search dup /done exch not def \n",
+		"      {exch pop exch pop} if \n",
+		"      /w1 exch length def \n",
+		"      w1 0 ne { \n",
+		"        newdict /DataSource ",
+		          " pix x crpp mul w1 crpp mul getinterval put \n",
+		"        newdict /Width w1 put \n",
+		"        mat 4 x neg put \n",
+		"        /x x w1 add def \n",
+		"        newdict image \n",
+		"        /tail tail w1 tail length w1 sub getinterval def \n",
+		"      } if \n",
+		"      done {exit} if \n",
+		"      tail substrs { \n",
+		"        anchorsearch {pop} if \n",
+		"      } forall \n",
+		"      /tail exch def \n",
+		"      tail length 0 eq {exit} if \n",
+		"      /x w tail length sub def \n",
+		"    } loop \n",
+		"  } for \n",
+		"  end \n",
+		"  grestore \n",
+		"} bind def \n\n\n", (char *) NULL);
+    } else if( !codeIncluded && (colorLevel == 0) ) {
+	/*
+	 * Monochrome-only code
+	 */
+
+	codeIncluded = !0;
+	Tcl_AppendResult( interp,
+		"/TkPhoto { \n",
+		"  gsave \n",
+		"  32 dict begin \n",
+		"  /dummyInteger exch def \n",
+		"  /olddict exch def \n",
+		"  olddict /DataSource get dup type /filetype ne { \n",
+		"    olddict /DataSource 3 -1 roll \n",
+		"    0 () /SubFileDecode filter put \n",
+		"  } { \n",
+		"    pop \n",
+		"  } ifelse \n",
+		"  /newdict olddict maxlength dict def \n",
+		"  olddict newdict copy pop \n",
+		"  /w newdict /Width get def \n",
+		"  /pix w 7 add 8 idiv string def \n",
+		"  /h newdict /Height get def \n",
+		"  1 w div 1 h div matrix scale \n",
+		"  olddict /ImageMatrix get exch matrix concatmatrix \n",
+		"  matrix invertmatrix concat \n",
+		"  newdict /Height 1 put \n",
+		"  newdict /DataSource pix put \n",
+		"  /mat [w 0 0 h 0 0] def \n",
+		"  newdict /ImageMatrix mat put \n",
+		"  0 1 h 1 sub { \n",
+		"    mat 5 3 -1 roll neg put \n",
+		"    0.000 0.000 0.000 setrgbcolor \n",
+		"    olddict /DataSource get pix readstring pop pop \n",
+		"    newdict /DataSource pix put \n",
+		"    newdict imagemask \n",
+		"    1.000 1.000 1.000 setrgbcolor \n",
+		"    olddict /DataSource get pix readstring pop pop \n",
+		"    newdict /DataSource pix put \n",
+		"    newdict imagemask \n",
+		"  } for \n",
+		"  end \n",
+		"  grestore \n",
+		"} bind def \n\n\n", (char *) NULL);
+    }
+
+    /*
+     * Check that at least one row of the image can be represented
+     * with a string less than 64 KB long (this is a limit in the
+     * Postscript interpreter).
+     */
+
+    switch (colorLevel)
+	{
+	    case 0: bytesPerLine = (width + 7) / 8;  maxWidth = 240000;  break;
+	    case 1: bytesPerLine = width;  maxWidth = 60000;  break;
+	    case 2: bytesPerLine = 3 * width;  maxWidth = 20000;  break;
+	}
+    if (bytesPerLine > 60000) {
+	Tcl_ResetResult(interp);
+	sprintf(buffer,
+		"Can't generate Postscript for images more than %d pixels wide",
+		maxWidth);
+	Tcl_AppendResult(interp, buffer, (char *) NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Set up the postscript code except for the image-data stream.
+     */
+
+    switch (colorLevel) {
+	case 0: 
+	    strcpy( cspace, "/DeviceGray");
+	    strcpy( decode, "[1 0]");
+	    bpc = 1;
+	    break;
+	case 1: 
+	    strcpy( cspace, "/DeviceGray");
+	    strcpy( decode, "[0 1]");
+	    bpc = 8;
+	    break;
+	default:
+	    strcpy( cspace, "/DeviceRGB");
+	    strcpy( decode, "[0 1 0 1 0 1]");
+	    bpc = 8;
+	    break;
+    }
+
+
+    Tcl_AppendResult(interp,
+	    cspace, " setcolorspace\n\n", (char *) NULL);
+
+    sprintf(buffer,
+	    "  /Width %d\n  /Height %d\n  /BitsPerComponent %d\n",
+	    width, height,  bpc);
+    Tcl_AppendResult(interp,
+	    "<<\n  /ImageType 1\n", buffer,
+	    "  /DataSource currentfile",
+	    "  /ASCIIHexDecode filter\n", (char *) NULL);
+
+
+    sprintf(buffer,
+	    "  /ImageMatrix [1 0 0 -1 0 %d]\n", height);
+    Tcl_AppendResult(interp, buffer,
+	    "  /Decode ", decode, "\n>>\n1 TkPhoto\n", (char *) NULL);
+
+
+    /*
+     * Check the PhotoImageBlock information.
+     * We assume that:
+     *     if pixelSize is 1,2 or 4, the image is R,G,B,A;
+     *     if pixelSize is 3, the image is R,G,B and offset[3] is bogus.
+     */
+
+    if (blockPtr->pixelSize == 3) {
+	/*
+	 * No alpha information: the whole image is opaque.
+	 */
+
+	alphaPtr = &opaque;
+	alphaPitch = alphaIncr = alphaOffset = 0;
+    } else {
+	/*
+	 * Set up alpha handling.
+	 */
+
+	alphaPtr = blockPtr->pixelPtr;
+	alphaPitch = blockPtr->pitch;
+	alphaIncr = blockPtr->pixelSize;
+	alphaOffset = blockPtr->offset[3];
+    }
+
+
+    for (yy = 0, lineLen=0; yy < height; yy++) {
+	switch (colorLevel) {
+	    case 0: {
+		/*
+		 * Generate data for image in monochrome mode.
+		 * No attempt at dithering is made--instead, just
+		 * set a threshold.
+		 * To handle transparecies we need to output two lines:
+		 * one for the black pixels, one for the white ones.
+		 */
+
+		unsigned char mask=0x80;
+		unsigned char data=0x00;
+		for (xx = 0; xx< width; xx ++) {
+		    pixelPtr = blockPtr->pixelPtr 
+			+ (yy * blockPtr->pitch) 
+			+ (xx *blockPtr->pixelSize);
+
+		    red = pixelPtr[blockPtr->offset[0]];
+		    green = pixelPtr[blockPtr->offset[1]];
+		    blue = pixelPtr[blockPtr->offset[2]];
+
+		    alpha = *(alphaPtr + (yy * alphaPitch)
+			    + (xx * alphaIncr) + alphaOffset);
+
+		    /*
+		     * If pixel is less than threshold, then it is black.
+		     */
+
+		    if ((alpha != 0) && 
+			    ( 0.3086 * red 
+				    + 0.6094 * green 
+				    + 0.082 * blue < 128)) {
+			data |= mask;
+		    }
+		    mask >>= 1;
+		    if (mask == 0) {
+			sprintf(buffer, "%02X", data);
+			Tcl_AppendResult(interp, buffer, (char *) NULL);
+			lineLen += 2;
+			if (lineLen >= 60) {
+			    lineLen = 0;
+			    Tcl_AppendResult(interp, "\n", (char *) NULL);
+			}
+			mask=0x80;
+			data=0x00;
+		    }
+		}
+		if ((width % 8) != 0) {
+		    sprintf(buffer, "%02X", data);
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    mask=0x80;
+		    data=0x00;
+		}
+
+		mask=0x80;
+		data=0x00;
+		for (xx = 0; xx< width; xx ++) {
+		    pixelPtr = blockPtr->pixelPtr 
+			+ (yy * blockPtr->pitch) 
+			+ (xx *blockPtr->pixelSize);
+
+		    red = pixelPtr[blockPtr->offset[0]];
+		    green = pixelPtr[blockPtr->offset[1]];
+		    blue = pixelPtr[blockPtr->offset[2]];
+
+		    alpha = *(alphaPtr + (yy * alphaPitch)
+			    + (xx * alphaIncr) + alphaOffset);
+			    
+		    /*
+		     * If pixel is greater than threshold, then it is white.
+		     */
+
+		    if ((alpha != 0) && 
+			    (  0.3086 * red 
+				    + 0.6094 * green 
+				    + 0.082 * blue >= 128)) {
+			data |= mask;
+		    }
+		    mask >>= 1;
+		    if (mask == 0) {
+			sprintf(buffer, "%02X", data);
+			Tcl_AppendResult(interp, buffer, (char *) NULL);
+			lineLen += 2;
+			if (lineLen >= 60) {
+			    lineLen = 0;
+			    Tcl_AppendResult(interp, "\n", (char *) NULL);
+			}
+			mask=0x80;
+			data=0x00;
+		    }
+		}
+		if ((width % 8) != 0) {
+		    sprintf(buffer, "%02X", data);
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    mask=0x80;
+		    data=0x00;
+		}
+		break;
+	    }
+	    case 1: {
+		/*
+		 * Generate transparency data.
+		 * We must prevent a transparent value of 0
+		 * because of a bug in some HP printers.
+		 */
+
+		for (xx = 0; xx < width; xx ++) {
+		    alpha = *(alphaPtr + (yy * alphaPitch)
+			    + (xx * alphaIncr) + alphaOffset);
+		    sprintf(buffer, "%02X", alpha | 0x01);
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    lineLen += 2;
+		    if (lineLen >= 60) {
+			lineLen = 0;
+			Tcl_AppendResult(interp, "\n", (char *) NULL);
+		    }
+		}
+
+
+		/*
+		 * Generate data in gray mode--in this case, take a 
+		 * weighted sum of the red, green, and blue values.
+		 */
+
+		for (xx = 0; xx < width; xx ++) {
+		    pixelPtr = blockPtr->pixelPtr 
+			+ (yy * blockPtr->pitch) 
+			+ (xx *blockPtr->pixelSize);
+
+		    red = pixelPtr[blockPtr->offset[0]];
+		    green = pixelPtr[blockPtr->offset[1]];
+		    blue = pixelPtr[blockPtr->offset[2]];
+
+		    sprintf(buffer, "%02X", (int) floor(0.5 +
+			    ( 0.3086 * red + 0.6094 * green + 0.0820 * blue)));
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    lineLen += 2;
+		    if (lineLen >= 60) {
+			lineLen = 0;
+			Tcl_AppendResult(interp, "\n", (char *) NULL);
+		    }
+		}
+		break;
+	    }
+	    default: {
+		/*
+		 * Generate transparency data.
+		 * We must prevent a transparent value of 0
+		 * because of a bug in some HP printers.
+		 */
+
+		for (xx = 0; xx < width; xx ++) {
+		    alpha = *(alphaPtr + (yy * alphaPitch)
+			    + (xx * alphaIncr) + alphaOffset);
+		    sprintf(buffer, "%02X", alpha | 0x01);
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    lineLen += 2;
+		    if (lineLen >= 60) {
+			lineLen = 0;
+			Tcl_AppendResult(interp, "\n", (char *) NULL);
+		    }
+		}
+
+
+		/*
+		 * Finally, color mode.  Here, just output the red, green,
+		 * and blue values directly.
+		 */
+
+		for (xx = 0; xx < width; xx ++) {
+		    pixelPtr = blockPtr->pixelPtr 
+			+ (yy * blockPtr->pitch) 
+			+ (xx *blockPtr->pixelSize);
+
+		    sprintf(buffer, "%02X%02X%02X",
+			    pixelPtr[blockPtr->offset[0]],
+			    pixelPtr[blockPtr->offset[1]],
+			    pixelPtr[blockPtr->offset[2]]);
+		    Tcl_AppendResult(interp, buffer, (char *) NULL);
+		    lineLen += 6;
+		    if (lineLen >= 60) {
+			lineLen = 0;
+			Tcl_AppendResult(interp, "\n", (char *) NULL);
+		    }
+		}
+		break;
+	    }
+	}
+    }
+
+    Tcl_AppendResult(interp, ">\n", (char *) NULL);
+    return TCL_OK;
+}
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 79443d4..6b6d241 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkDecls.h,v 1.10 2000/04/19 23:11:23 ericm Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.11 2000/04/25 01:03:06 hobbs Exp $
  */
 
 #ifndef _TKDECLS
@@ -815,6 +815,11 @@ EXTERN int		Tk_PostscriptStipple _ANSI_ARGS_((
 /* 237 */
 EXTERN double		Tk_PostscriptY _ANSI_ARGS_((double y, 
 				Tk_PostscriptInfo psInfo));
+/* 238 */
+EXTERN int		Tk_PostscriptPhoto _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tk_PhotoImageBlock * blockPtr, 
+				Tk_PostscriptInfo psInfo, int width, 
+				int height));
 
 typedef struct TkStubHooks {
     struct TkPlatStubs *tkPlatStubs;
@@ -1065,6 +1070,7 @@ typedef struct TkStubs {
     void (*tk_PostscriptPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PostscriptInfo psInfo, double * coordPtr, int numPoints)); /* 235 */
     int (*tk_PostscriptStipple) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap)); /* 236 */
     double (*tk_PostscriptY) _ANSI_ARGS_((double y, Tk_PostscriptInfo psInfo)); /* 237 */
+    int (*tk_PostscriptPhoto) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height)); /* 238 */
 } TkStubs;
 
 #ifdef __cplusplus
@@ -2027,6 +2033,10 @@ extern TkStubs *tkStubsPtr;
 #define Tk_PostscriptY \
 	(tkStubsPtr->tk_PostscriptY) /* 237 */
 #endif
+#ifndef Tk_PostscriptPhoto
+#define Tk_PostscriptPhoto \
+	(tkStubsPtr->tk_PostscriptPhoto) /* 238 */
+#endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkImage.c b/generic/tkImage.c
index e54a189..0c763a1 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkImage.c,v 1.5 1999/12/14 06:52:28 hobbs Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.6 2000/04/25 01:03:06 hobbs Exp $
  */
 
 #include "tkInt.h"
@@ -634,11 +634,31 @@ Tk_PostscriptImage(image, interp, tkwin, psinfo, x, y, width, height, prepass)
     int width, height;		/* Dimensions of region to redraw. */
     int prepass;
 {
+    Image *imagePtr = (Image *) image;
     int result;
     XImage *ximage;
     Pixmap pmap;
     GC newGC;
     XGCValues gcValues;
+
+    if (imagePtr->masterPtr->typePtr == NULL) {
+	/*
+	 * No master for image, so nothing to display on postscript.
+	 */
+	return TCL_OK;
+    }
+
+    /*
+     * Check if an image specific postscript-generation function
+     * exists; otherwise go on with generic code.
+     */
+
+    if (imagePtr->masterPtr->typePtr->postscriptProc != NULL) {
+	return (*imagePtr->masterPtr->typePtr->postscriptProc)(
+	    imagePtr->masterPtr->masterData, interp, tkwin, psinfo,
+	    x, y, width, height, prepass);
+    }
+
     if (prepass) {
 	return TCL_OK;
     }
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 9b2519a..e3aad9f 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -15,7 +15,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.17 2000/02/08 11:31:33 hobbs Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.18 2000/04/25 01:03:06 hobbs Exp $
  */
 
 #include "tkInt.h"
@@ -31,7 +31,7 @@
  * Declaration for internal Xlib function used here:
  */
 
-extern _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
+extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
 
 /*
  * A signed 8-bit integral type.  If chars are unsigned and the compiler
@@ -293,6 +293,10 @@ static void		ImgPhotoDisplay _ANSI_ARGS_((ClientData clientData,
 static void		ImgPhotoFree _ANSI_ARGS_((ClientData clientData,
 			    Display *display));
 static void		ImgPhotoDelete _ANSI_ARGS_((ClientData clientData));
+static int		ImgPhotoPostscript _ANSI_ARGS_((ClientData clientData,
+			    Tcl_Interp *interp, Tk_Window tkwin,
+			    Tk_PostscriptInfo psInfo, int x, int y, int width,
+			    int height, int prepass));
 
 Tk_ImageType tkPhotoImageType = {
     "photo",			/* name */
@@ -301,7 +305,7 @@ Tk_ImageType tkPhotoImageType = {
     ImgPhotoDisplay,		/* displayProc */
     ImgPhotoFree,		/* freeProc */
     ImgPhotoDelete,		/* deleteProc */
-    (Tk_ImagePostscriptProc *) NULL, /* postscriptProc */
+    ImgPhotoPostscript,		/* postscriptProc */
     (Tk_ImageType *) NULL	/* nextPtr */
 };
 
@@ -5112,3 +5116,39 @@ Tk_CreatePhotoOption(interp, name, proc)
     Tcl_SetAssocData(interp, "photoOption", PhotoOptionCleanupProc,
 		(ClientData) ptr);
 }
+
+/*
+ *--------------------------------------------------------------
+ *
+ * TkPostscriptPhoto --
+ *
+ *	This procedure is called to output the contents of a
+ *	photo image in Postscript by calling the Tk_PostscriptPhoto
+ *	function.
+ *
+ * Results:
+ *	Returns a standard Tcl return value.
+ *
+ * Side effects:
+ *	None.
+ *
+ *--------------------------------------------------------------
+ */
+static int
+ImgPhotoPostscript(clientData, interp, tkwin, psInfo,
+        x, y, width, height, prepass)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    Tk_Window tkwin;
+    Tk_PostscriptInfo psInfo; /* postscript info */
+    int x, y;   /* First pixel to output */
+    int width, height;  /* Width and height of area */
+    int prepass;
+{
+    Tk_PhotoImageBlock block;
+
+    Tk_PhotoGetImage((Tk_PhotoHandle) clientData, &block);
+    block.pixelPtr += y * block.pitch + x * block.pixelSize;
+
+    return Tk_PostscriptPhoto(interp, &block, psInfo, width, height);
+}
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 5bbd282..ea50f6a 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.21 2000/04/19 23:11:24 ericm Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.22 2000/04/25 01:03:07 hobbs Exp $
  */
 
 #include "tkInt.h"
@@ -948,6 +948,7 @@ TkStubs tkStubs = {
     Tk_PostscriptPath, /* 235 */
     Tk_PostscriptStipple, /* 236 */
     Tk_PostscriptY, /* 237 */
+    Tk_PostscriptPhoto, /* 238 */
 };
 
 /* !END!: Do not edit above this line. */