diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2002-02-19 16:30:26 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2002-02-19 16:30:26 (GMT) |
| commit | c2ff4f3295816505cc6c8bc727bdb59a4600e9c6 (patch) | |
| tree | 94062d3833d55e33029a21882fd4c015278d324d | |
| parent | c7d9b8120ab7ba175c080cf1e27fddbbf8a72eb0 (diff) | |
| download | tk-c2ff4f3295816505cc6c8bc727bdb59a4600e9c6.zip tk-c2ff4f3295816505cc6c8bc727bdb59a4600e9c6.tar.gz tk-c2ff4f3295816505cc6c8bc727bdb59a4600e9c6.tar.bz2 | |
Minor fixes as part of TIP#72 (and one just noticed in passing)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkFrame.c | 4 | ||||
| -rw-r--r-- | generic/tkImgPPM.c | 4 | ||||
| -rw-r--r-- | generic/tkImgPhoto.c | 8 |
4 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2002-02-19 Donal K. Fellows <fellowsd@cs.man.ac.uk> + * generic/tkImgPhoto.c (MatchFileFormat): Tcl_Seek takes + Tcl_WideInt offset (three places.) + * generic/tkImgPPM.c (FileReadPPM): Tcl_Seek takes Tcl_WideInt offset. + * generic/tkFrame.c (ConfigureFrame): Stop GCC warning. + * generic/tkImgGIF.c: Made file meet the formatting rules from the Tcl Engineering Manual better; mostly differences in whitespace. diff --git a/generic/tkFrame.c b/generic/tkFrame.c index bebc3b5..ec969d9 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -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: tkFrame.c,v 1.11 2002/01/17 05:13:11 dgp Exp $ + * RCS: @(#) $Id: tkFrame.c,v 1.12 2002/02/19 16:30:26 dkf Exp $ */ #include "default.h" @@ -920,7 +920,7 @@ ConfigureFrame(interp, framePtr, objc, objv) { Tk_SavedOptions savedOptions; char *oldMenuName; - Tk_Window oldWindow; + Tk_Window oldWindow = NULL; Labelframe *labelframePtr = (Labelframe *) framePtr; /* diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c index 98c790b..ab99679 100644 --- a/generic/tkImgPPM.c +++ b/generic/tkImgPPM.c @@ -13,7 +13,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPPM.c,v 1.8 2001/09/14 20:35:58 andreas_kupries Exp $ + * RCS: @(#) $Id: tkImgPPM.c,v 1.9 2002/02/19 16:30:26 dkf Exp $ */ #define USE_OLD_IMAGE @@ -192,7 +192,7 @@ FileReadPPM(interp, chan, fileName, formatString, imageHandle, destX, destY, Tk_PhotoExpand(imageHandle, destX + width, destY + height); if (srcY > 0) { - Tcl_Seek(chan, (srcY * block.pitch), SEEK_CUR); + Tcl_Seek(chan, (Tcl_WideInt)(srcY * block.pitch), SEEK_CUR); } nLines = (MAX_MEMORY + block.pitch - 1) / block.pitch; diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index b1a7fc0..4f81eca 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.28 2002/02/01 14:27:30 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.29 2002/02/19 16:30:26 dkf Exp $ */ #include "tkInt.h" @@ -3572,7 +3572,7 @@ MatchFileFormat(interp, chan, fileName, formatObj, imageFormatPtr, } } if (formatPtr->fileMatchProc != NULL) { - (void) Tcl_Seek(chan, 0L, SEEK_SET); + (void) Tcl_Seek(chan, Tcl_LongAsWide(0L), SEEK_SET); if ((*formatPtr->fileMatchProc)(chan, fileName, formatObj, widthPtr, heightPtr, interp)) { @@ -3603,7 +3603,7 @@ MatchFileFormat(interp, chan, fileName, formatObj, imageFormatPtr, } } if (formatPtr->fileMatchProc != NULL) { - (void) Tcl_Seek(chan, 0L, SEEK_SET); + (void) Tcl_Seek(chan, Tcl_LongAsWide(0L), SEEK_SET); if ((*formatPtr->fileMatchProc)(chan, fileName, (Tcl_Obj *) formatString, widthPtr, heightPtr, interp)) { if (*widthPtr < 1) { @@ -3633,7 +3633,7 @@ MatchFileFormat(interp, chan, fileName, formatObj, imageFormatPtr, *imageFormatPtr = formatPtr; *oldformat = useoldformat; - (void) Tcl_Seek(chan, 0L, SEEK_SET); + (void) Tcl_Seek(chan, Tcl_LongAsWide(0L), SEEK_SET); return TCL_OK; } |