git: 1b057efd8886 - main - graphics/gimp-app: fix build with clang 15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 07 Jan 2023 14:12:21 UTC
The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=1b057efd888664e99dbe2a2ae548f2d2278483b4 commit 1b057efd888664e99dbe2a2ae548f2d2278483b4 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-01-06 19:57:09 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2023-01-07 14:11:02 +0000 graphics/gimp-app: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that graphics/gimp-app failed to build with clang 15: file-dicom.c:605:26: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gint32' (aka 'int') [-Wint-conversion] return NULL; ^~~~ This is because the return statement is a function that should return an integer, not a pointer. Replace it with the error value -1, as used elsewhere in the function. PR: 268790 Approved by: fluffy (maintainer) MFH: 2023Q1 --- graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c new file mode 100644 index 000000000000..a95402dd819d --- /dev/null +++ b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c @@ -0,0 +1,11 @@ +--- plug-ins/common/file-dicom.c.orig 2022-06-12 20:26:00 UTC ++++ plug-ins/common/file-dicom.c +@@ -602,7 +602,7 @@ load_image (const gchar *filename, + (gchar *) value, samples_per_pixel); + g_free (dicominfo); + fclose (DICOM); +- return NULL; ++ return -1; + } + + break;