Merge branch 'release'

malaterre · malaterre · commit 2921aa1052a1 · 2025-02-07T11:53:21.000+01:00
diff --git a/Utilities/gdcmcharls/jpegmarkersegment.cpp b/Utilities/gdcmcharls/jpegmarkersegment.cpp
@@ -58,7 +58,7 @@ unique_ptr<JpegMarkerSegment> JpegMarkerSegment::CreateJpegFileInterchangeFormat
     content.push_back(static_cast<uint8_t>(params.Ythumbnail));
     if (params.Xthumbnail > 0)
     {
-        if (params.thumbnail)
+        if (!params.thumbnail)
             throw CreateSystemError(ApiResult::InvalidJlsParameters, "params.Xthumbnail is > 0 but params.thumbnail == null_ptr");
 
         content.insert(content.end(), static_cast<uint8_t*>(params.thumbnail),

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ unique_ptr<JpegMarkerSegment> JpegMarkerSegment::CreateJpegFileInterchangeFormat`
`58`	`58`	`content.push_back(static_cast<uint8_t>(params.Ythumbnail));`
`59`	`59`	`if (params.Xthumbnail > 0)`
`60`	`60`	`{`
`61`		`- if (params.thumbnail)`
	`61`	`+ if (!params.thumbnail)`
`62`	`62`	`throw CreateSystemError(ApiResult::InvalidJlsParameters, "params.Xthumbnail is > 0 but params.thumbnail == null_ptr");`
`63`	`63`
`64`	`64`	`content.insert(content.end(), static_cast<uint8_t*>(params.thumbnail),`