diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-28 15:56:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-28 15:56:40 (GMT) |
| commit | aaff6a472281e7010de68713b74d4c35a6d1db20 (patch) | |
| tree | bfcf50f5547299491675e70a312c7f9ce12f68d9 /generic/tkImgPNG.c | |
| parent | e8c84a297a502e5e9e366fe2dcaef0d81e66e6c2 (diff) | |
| parent | 51e8e55cf0e7c6b845a26e90f1ec563a14b60ff6 (diff) | |
| download | tk-aaff6a472281e7010de68713b74d4c35a6d1db20.zip tk-aaff6a472281e7010de68713b74d4c35a6d1db20.tar.gz tk-aaff6a472281e7010de68713b74d4c35a6d1db20.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tkImgPNG.c')
| -rw-r--r-- | generic/tkImgPNG.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/generic/tkImgPNG.c b/generic/tkImgPNG.c index 1476de4..316e58b 100644 --- a/generic/tkImgPNG.c +++ b/generic/tkImgPNG.c @@ -2818,7 +2818,7 @@ FileMatchPNG( Tcl_Interp *interp, /* Interpreter to use for reporting errors. */ Tcl_Channel chan, /* The image file, open for reading. */ TCL_UNUSED(const char *), /* The name of the image file. */ - TCL_UNUSED(Tcl_Obj *), /* User-specified format object, or NULL. */ + TCL_UNUSED(Tcl_Obj *), /* User-specified format object, or NULL. */ TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ int *widthPtr, int *heightPtr, /* The dimensions of the image are returned @@ -2864,16 +2864,18 @@ static int FileReadPNG( Tcl_Interp *interp, /* Interpreter to use for reporting errors. */ Tcl_Channel chan, /* The image file, open for reading. */ - TCL_UNUSED(const char *), /* The name of the image file. */ + TCL_UNUSED(const char *), /* The name of the image file. */ Tcl_Obj *fmtObj, /* User-specified format object, or NULL. */ - TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ + TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ Tk_PhotoHandle imageHandle, /* The photo image to write into. */ int destX, int destY, /* Coordinates of top-left pixel in photo * image to be written to. */ - TCL_UNUSED(int), TCL_UNUSED(int), /* Dimensions of block of photo image to be + TCL_UNUSED(int), /* Dimensions of block of photo image to be * written to. */ - TCL_UNUSED(int), TCL_UNUSED(int), /* Coordinates of top-left pixel to be used in + TCL_UNUSED(int), + TCL_UNUSED(int), /* Coordinates of top-left pixel to be used in * image being read. */ + TCL_UNUSED(int), Tcl_Obj *metadataOutObj) /* metadata return dict, may be NULL */ { PNGImage png; @@ -2923,11 +2925,11 @@ static int StringMatchPNG( Tcl_Interp *interp, /* Interpreter to use for reporting errors. */ Tcl_Obj *pObjData, /* the object containing the image data */ - TCL_UNUSED(Tcl_Obj *), /* the image format object, or NULL */ - TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ + TCL_UNUSED(Tcl_Obj *), /* the image format object, or NULL */ + TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ int *widthPtr, /* where to put the string width */ int *heightPtr, /* where to put the string height */ - TCL_UNUSED(Tcl_Obj *)) /* metadata return dict, may be NULL */ + TCL_UNUSED(Tcl_Obj *)) /* metadata return dict, may be NULL */ { PNGImage png; int match = 0; @@ -2969,11 +2971,13 @@ StringReadPNG( Tcl_Interp *interp, /* interpreter for reporting errors in */ Tcl_Obj *pObjData, /* object containing the image */ Tcl_Obj *fmtObj, /* format object, or NULL */ - TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ + TCL_UNUSED(Tcl_Obj *), /* metadata input, may be NULL */ Tk_PhotoHandle imageHandle, /* the image to write this data into */ int destX, int destY, /* The rectangular region of the */ - TCL_UNUSED(int), TCL_UNUSED(int), /* image to copy */ - TCL_UNUSED(int), TCL_UNUSED(int), + TCL_UNUSED(int), /* image to copy */ + TCL_UNUSED(int), + TCL_UNUSED(int), + TCL_UNUSED(int), Tcl_Obj *metadataOutObj) /* metadata return dict, may be NULL */ { PNGImage png; @@ -3729,7 +3733,7 @@ static int FileWritePNG( Tcl_Interp *interp, const char *filename, - TCL_UNUSED(Tcl_Obj *), + TCL_UNUSED(Tcl_Obj *), Tcl_Obj *metadataInObj, Tk_PhotoImageBlock *blockPtr) { @@ -3800,7 +3804,7 @@ FileWritePNG( static int StringWritePNG( Tcl_Interp *interp, - TCL_UNUSED(Tcl_Obj *), + TCL_UNUSED(Tcl_Obj *), Tcl_Obj *metadataInObj, Tk_PhotoImageBlock *blockPtr) { |