diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | doc/FindPhoto.3 | 7 | ||||
| -rw-r--r-- | generic/tk.decls | 6 | ||||
| -rw-r--r-- | generic/tk.h | 10 | ||||
| -rw-r--r-- | generic/tkImgPhoto.c | 12 |
5 files changed, 23 insertions, 17 deletions
@@ -1,5 +1,10 @@ 2002-06-14 Donal K. Fellows <fellowsd@cs.man.ac.uk> + * doc/FindPhoto.3, generic/tk.h, generic/tk.decls: + * generic/tkImgPhoto.c: Changed *_Old to *_NoComposite and + USE_OLD_PHOTO_PUT_BLOCK to USE_COMPOSITELESS_PHOTO_PUT_BLOCK + following a suggestion from Don Porter. + * tests/imgPhoto.test: Added tests of -compositingrule * doc/photo.n: Added documentation for "-compositingrule". diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3 index d1c96d1..9116252 100644 --- a/doc/FindPhoto.3 +++ b/doc/FindPhoto.3 @@ -9,7 +9,7 @@ '\" Department of Computer Science, '\" Australian National University. '\" -'\" RCS: @(#) $Id: FindPhoto.3,v 1.4 2002/06/14 13:35:47 dkf Exp $ +'\" RCS: @(#) $Id: FindPhoto.3,v 1.5 2002/06/14 14:07:50 dkf Exp $ '\" .so man.macros .TH Tk_FindPhoto 3 8.0 Tk "Tk Library Procedures" @@ -220,8 +220,9 @@ calls to \fBTk_PhotoPutBlock\fR, \fBTk_PhotoPutZoomedBlock\fR or In Tk 8.3 and earlier, \fBTk_PhotoPutBlock\fR and \fBTk_PhotoPutZoomedBlock\fR had different signatures. If you want to compile code that uses the old interface against 8.4 without updating -your code, compile it with the flag -DUSE_OLD_PHOTO_PUT_BLOCK. Code -linked using Stubs against older versions of Tk will continue to work. +your code, compile it with the flag +-DUSE_COMPOSITELESS_PHOTO_PUT_BLOCK. Code linked using Stubs against +older versions of Tk will continue to work. .VE 8.4 .SH CREDITS diff --git a/generic/tk.decls b/generic/tk.decls index 445845a..d3a7866 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -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: tk.decls,v 1.19 2002/06/14 13:35:47 dkf Exp $ +# RCS: @(#) $Id: tk.decls,v 1.20 2002/06/14 14:07:50 dkf Exp $ library tk @@ -708,13 +708,13 @@ declare 143 generic { } declare 144 generic { - void Tk_PhotoPutBlock_Old (Tk_PhotoHandle handle, \ + void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, \ Tk_PhotoImageBlock *blockPtr, int x, int y, \ int width, int height) } declare 145 generic { - void Tk_PhotoPutZoomedBlock_Old (Tk_PhotoHandle handle, \ + void Tk_PhotoPutZoomedBlock_NoComposite (Tk_PhotoHandle handle, \ Tk_PhotoImageBlock *blockPtr, int x, int y, \ int width, int height, int zoomX, int zoomY, \ int subsampleX, int subsampleY) diff --git a/generic/tk.h b/generic/tk.h index fecb2ab..81e6e36 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,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.h,v 1.59 2002/06/14 13:35:47 dkf Exp $ + * RCS: @(#) $Id: tk.h,v 1.60 2002/06/14 14:07:51 dkf Exp $ */ #ifndef _TK @@ -1476,16 +1476,16 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, * declarations of what is actually there can be correct. */ -#ifdef USE_OLD_PHOTO_PUT_BLOCK +#ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK # ifdef Tk_PhotoPutBlock # undef Tk_PhotoPutBlock # endif -# define Tk_PhotoPutBlock Tk_PhotoPutBlock_Old +# define Tk_PhotoPutBlock Tk_PhotoPutBlock_NoComposite # ifdef Tk_PhotoPutZoomedBlock # undef Tk_PhotoPutZoomedBlock # endif -# define Tk_PhotoPutZoomedBlock Tk_PhotoPutZoomedBlock_Old -#endif /* USE_OLD_PHOTO_PUT_BLOCK */ +# define Tk_PhotoPutZoomedBlock Tk_PhotoPutZoomedBlock_NoComposite +#endif /* USE_COMPOSITELESS_PHOTO_PUT_BLOCK */ /* * Tcl commands exported by Tk: diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 032ce89..7f82a77 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -16,7 +16,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.31 2002/06/14 13:35:48 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.32 2002/06/14 14:07:51 dkf Exp $ */ #include "tkInt.h" @@ -5505,16 +5505,16 @@ ImgPhotoPostscript(clientData, interp, tkwin, psInfo, /* *---------------------------------------------------------------------- * - * Tk_PhotoPutBlock_Old, Tk_PhotoPutZoomedBlock_Old -- + * Tk_PhotoPutBlock_NoComposite, Tk_PhotoPutZoomedBlock_NoComposite -- * * These backward-compatability functions just exist to fill slots in - * stubs table. For the behaviour of *_Old, refer to the + * stubs table. For the behaviour of *_NoComposite, refer to the * corresponding function without the extra suffix. * *---------------------------------------------------------------------- */ void -Tk_PhotoPutBlock_Old(handle, blockPtr, x, y, width, height) +Tk_PhotoPutBlock_NoComposite(handle, blockPtr, x, y, width, height) Tk_PhotoHandle handle; Tk_PhotoImageBlock *blockPtr; int x, y, width, height; @@ -5524,8 +5524,8 @@ Tk_PhotoPutBlock_Old(handle, blockPtr, x, y, width, height) } void -Tk_PhotoPutZoomedBlock_Old(handle, blockPtr, x, y, width, height, - zoomX, zoomY, subsampleX, subsampleY) +Tk_PhotoPutZoomedBlock_NoComposite(handle, blockPtr, x, y, width, height, + zoomX, zoomY, subsampleX, subsampleY) Tk_PhotoHandle handle; Tk_PhotoImageBlock *blockPtr; int x, y, width, height, zoomX, zoomY, subsampleX, subsampleY; |