diff options
| -rw-r--r-- | generic/tkImgPhoto.c | 23 | ||||
| -rw-r--r-- | generic/tkText.c | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 2cfe7ff..b56261d 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.56 2005/08/10 22:02:22 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.57 2005/08/11 01:55:04 dgp Exp $ */ #include "tkInt.h" @@ -977,26 +977,24 @@ ImgPhotoCmd(clientData, interp, objc, objv) data = ImgGetPhoto(masterPtr, &block, &options); if (oldformat) { - typedef (int (*oldStringWriterProc) (Tcl_Interp *interp, - Tcl_DString *dataPtr, char *formatString, - Tk_PhotoImageBlock *blockPtr)); Tcl_DString buffer; Tcl_DStringInit(&buffer); - result = ((oldStringWriterProc) stringWriteProc) (interp, &buffer, - Tcl_GetString(options.format), &block); + result = ((int (*) (Tcl_Interp *interp, + Tcl_DString *dataPtr, char *formatString, + Tk_PhotoImageBlock *blockPtr)) stringWriteProc) + (interp, &buffer, Tcl_GetString(options.format), &block); if (result == TCL_OK) { Tcl_DStringResult(interp, &buffer); } else { Tcl_DStringFree(&buffer); } } else { - typedef (int (*newStringWriterProc) (Tcl_Interp *interp, - Tcl_Obj *formatString, Tk_PhotoImageBlock *blockPtr, - VOID *dummy)); - result = ((newStringWriterProc) stringWriteProc) (interp, - options.format, &block, (VOID *) NULL); + result = ((int (*) (Tcl_Interp *interp, + Tcl_Obj *formatString, Tk_PhotoImageBlock *blockPtr, + VOID *dummy)) stringWriteProc) + (interp, options.format, &block, (VOID *) NULL); } if (options.background) { Tk_FreeColor(options.background); @@ -4859,7 +4857,6 @@ Tk_PhotoPutZoomedBlock(interp, handle, blockPtr, x, y, width, height, */ if (alphaOffset) { - int x1, y1, end; if (compRule != TK_PHOTO_COMPOSITE_OVERLAY) { /* @@ -4879,7 +4876,7 @@ Tk_PhotoPutZoomedBlock(interp, handle, blockPtr, x, y, width, height, TkDestroyRegion(workRgn); } - TkBuildRegionFromAlphaData(masterPtr->validRegion, x, y, width, height, + TkpBuildRegionFromAlphaData(masterPtr->validRegion, x, y, width, height, &masterPtr->pix32[(y * masterPtr->width + x) * 4 + 3], 4, masterPtr->width * 4); } else { diff --git a/generic/tkText.c b/generic/tkText.c index bb4044b..7034579 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkText.c,v 1.58 2005/08/10 22:02:22 dkf Exp $ + * RCS: @(#) $Id: tkText.c,v 1.59 2005/08/11 01:55:04 dgp Exp $ */ #include "default.h" @@ -2042,7 +2042,7 @@ ConfigureText(interp, textPtr, objc, objv) &first); TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, NULL, TkBTreeNumLines(textPtr->sharedTextPtr->tree, NULL), - &last); + 0, &last); TkBTreeStartSearch(&first, &last, textPtr->selTagPtr, &search); if (!TkBTreeCharTagged(&first, textPtr->selTagPtr) && !TkBTreeNextTag(&search)) { |