Mercurial > hg > orthanc

changeset 4984:c8cdf5163cd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Alain Mazy <am@osimis.io>
date Mon, 25 Apr 2022 18:54:45 +0200
parents 63bf8fb86dae
children c767035fff77
files OrthancServer/Sources/ServerContext.cpp
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.cpp	Mon Apr 25 18:38:20 2022 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Mon Apr 25 18:54:45 2022 +0200
@@ -2343,12 +2343,9 @@
       && (dicomAsJson != NULL))
     {
       
-      if (mainDicomTags.GetSize() > 0)
-      {
-        resource.tags_.Merge(mainDicomTags);
-      }
+      resource.tags_.Merge(mainDicomTags);
 
-      if (dicomAsJson != NULL && dicomAsJson->isObject())
+      if (dicomAsJson->isObject())
       {
         resource.tags_.FromDicomAsJson(*dicomAsJson);
       }