Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | eliminate use of deprecated Tcl_SaveResult API |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
b279f14c1679fb93fccffc3f9cbd04cc |
| User & Date: | jan.nijtmans 2013-01-20 11:40:02 |
Context
|
2013-01-22
| ||
| 21:28 | Bug [3601782]: Produce a nice error-message when the first Tcl_InitStubs() fails, in stead of simply abort() check-in: f31886ee user: jan.nijtmans tags: trunk | |
|
2013-01-20
| ||
| 11:40 | eliminate use of deprecated Tcl_SaveResult API check-in: b279f14c user: jan.nijtmans tags: trunk | |
|
2013-01-17
| ||
| 13:39 | merge-mark check-in: af9bd270 user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tkImgPNG.c.
| ︙ | ︙ | |||
330 331 332 333 334 335 336 |
/*
* Initialize Zlib inflate/deflate stream.
*/
if (Tcl_ZlibStreamInit(NULL, dir, TCL_ZLIB_FORMAT_ZLIB,
TCL_ZLIB_COMPRESS_DEFAULT, NULL, &pngPtr->stream) != TCL_OK) {
| > | | | > | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 |
/*
* Initialize Zlib inflate/deflate stream.
*/
if (Tcl_ZlibStreamInit(NULL, dir, TCL_ZLIB_FORMAT_ZLIB,
TCL_ZLIB_COMPRESS_DEFAULT, NULL, &pngPtr->stream) != TCL_OK) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"zlib initialization failed", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "PNG", "ZLIB_INIT", NULL);
}
if (objPtr) {
Tcl_DecrRefCount(objPtr);
}
return TCL_ERROR;
}
return TCL_OK;
|
| ︙ | ︙ | |||
2663 2664 2665 2666 2667 2668 2669 |
Tcl_Obj *fmtObj,
int *widthPtr,
int *heightPtr,
Tcl_Interp *interp)
{
PNGImage png;
int match = 0;
| < < < | < | 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 |
Tcl_Obj *fmtObj,
int *widthPtr,
int *heightPtr,
Tcl_Interp *interp)
{
PNGImage png;
int match = 0;
InitPNGImage(NULL, &png, chan, NULL, TCL_ZLIB_STREAM_INFLATE);
if (ReadIHDR(interp, &png) == TCL_OK) {
*widthPtr = png.block.width;
*heightPtr = png.block.height;
match = 1;
}
CleanupPNGImage(&png);
return match;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
2755 2756 2757 2758 2759 2760 2761 |
Tcl_Obj *fmtObj,
int *widthPtr,
int *heightPtr,
Tcl_Interp *interp)
{
PNGImage png;
int match = 0;
| < < | < | 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 |
Tcl_Obj *fmtObj,
int *widthPtr,
int *heightPtr,
Tcl_Interp *interp)
{
PNGImage png;
int match = 0;
InitPNGImage(NULL, &png, NULL, pObjData, TCL_ZLIB_STREAM_INFLATE);
png.strDataBuf = Tcl_GetByteArrayFromObj(pObjData, &png.strDataLen);
if (ReadIHDR(interp, &png) == TCL_OK) {
*widthPtr = png.block.width;
*heightPtr = png.block.height;
match = 1;
}
CleanupPNGImage(&png);
return match;
}
/*
*----------------------------------------------------------------------
*
* StringReadPNG --
|
| ︙ | ︙ |