# HG changeset patch # User Alain Mazy # Date 1669118230 -3600 # Node ID 027366cae7660d39d18e54e63988bfd8ee42ac9b # Parent a386dfb5b386041d341ae912042d2b65f1ea14b8 cppcheck diff -r a386dfb5b386 -r 027366cae766 OrthancServer/Resources/RunCppCheck.sh --- a/OrthancServer/Resources/RunCppCheck.sh Tue Nov 22 12:54:10 2022 +0100 +++ b/OrthancServer/Resources/RunCppCheck.sh Tue Nov 22 12:57:10 2022 +0100 @@ -35,7 +35,7 @@ assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1018 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:289 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:388 -assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3460 +assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3490 assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:241 EOF diff -r a386dfb5b386 -r 027366cae766 OrthancServer/Sources/ServerJobs/ArchiveJob.cpp --- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Tue Nov 22 12:54:10 2022 +0100 +++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Tue Nov 22 12:57:10 2022 +0100 @@ -647,23 +647,18 @@ writer.OpenFile(filename_.c_str()); - bool transcodeSuccess = false; - std::unique_ptr parsed; - if (!transcodeSuccess) + writer.Write(content); + + if (dicomDir != NULL) { - writer.Write(content); - - if (dicomDir != NULL) + if (parsed.get() == NULL) { - if (parsed.get() == NULL) - { - parsed.reset(new ParsedDicomFile(content)); - } + parsed.reset(new ParsedDicomFile(content)); + } - dicomDir->Add(dicomDirFolder, filename_, *parsed); - } + dicomDir->Add(dicomDirFolder, filename_, *parsed); } break;