mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-15 01:23:35 +02:00
1aa5e219c1
[sam: Revbump for modern C fix, add bug link to patch.] Closes: https://bugs.gentoo.org/883707 Signed-off-by: Christopher Byrne <salah.coronya@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38327 Signed-off-by: Sam James <sam@gentoo.org>
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
https://bugs.gentoo.org/883707
|
|
diff --git a/imgJPEG.c b/imgJPEG.c
|
|
index cb62e40..4ca80b5 100644
|
|
--- a/imgJPEG.c
|
|
+++ b/imgJPEG.c
|
|
@@ -118,7 +118,7 @@ static int ChnWriteJPEG _ANSI_ARGS_((Tcl_Interp *interp,
|
|
char *fileName, Tcl_Obj *format,
|
|
Tk_PhotoImageBlock *blockPtr));
|
|
static int StringWriteJPEG _ANSI_ARGS_((Tcl_Interp *interp,
|
|
- Tcl_DString *dataPtr, Tcl_Obj *format,
|
|
+ Tcl_Obj *format,
|
|
Tk_PhotoImageBlock *blockPtr));
|
|
|
|
Tk_PhotoImageFormat imgFmtJPEG = {
|
|
@@ -970,7 +970,7 @@ CommonReadJPEG(interp, cinfo, format, imageHandle, destX, destY,
|
|
int srcX, srcY; /* Coordinates of top-left pixel to be used
|
|
* in image being read. */
|
|
{
|
|
- static char *jpegReadOptions[] = {"-fast", "-grayscale", NULL};
|
|
+ static const char *jpegReadOptions[] = {"-fast", "-grayscale", NULL};
|
|
int fileWidth, fileHeight, stopY, curY, outY, outWidth, outHeight;
|
|
myblock bl;
|
|
#define block bl.ck
|
|
@@ -1262,7 +1262,7 @@ CommonWriteJPEG(interp, cinfo, format, blockPtr)
|
|
Tcl_Obj *format;
|
|
Tk_PhotoImageBlock *blockPtr;
|
|
{
|
|
- static char *jpegWriteOptions[] = {"-grayscale", "-optimize",
|
|
+ static const char *jpegWriteOptions[] = {"-grayscale", "-optimize",
|
|
"-progressive", "-quality", "-smooth", NULL};
|
|
JSAMPROW row_pointer[1]; /* pointer to original data scanlines */
|
|
JSAMPARRAY buffer; /* Intermediate row buffer */
|