orthanc: Core/DicomParsing/ParsedDicomFile.cpp comparison

comparison Core/DicomParsing/ParsedDicomFile.cpp @ 2445:6e5bc5c6d1a4

Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 14 Dec 2017 13:02:06 +0100
parents	e4045b3c9772
children	878b59270859

comparison

equal deleted inserted replaced

-:d9e3781d2023
+:6e5bc5c6d1a4
 This file is based on portions of the following project:
 Program: GDCM (Grassroots DICOM). A DICOM library
 Module:  http://gdcm.sourceforge.net/Copyright.html
 Copyright (c) 2006-2011 Mathieu Malaterre
 Copyright (c) 1993-2005 CREATIS
 (CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image)
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any
 contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to
 endorse or promote products derived from this software without specific
 prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================================================*/
 #include "../PrecompiledHeaders.h"
 #ifndef NOMINMAX
 void ParsedDicomFile::CreateFromDicomMap(const DicomMap& source,
 Encoding defaultEncoding)
 {
-pimpl_->file_.reset(new DcmFileFormat);
+try
+{
-const DicomValue* tmp = source.TestAndGetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET);
+pimpl_->file_.reset(new DcmFileFormat);
-if (tmp != NULL)
-{
+const DicomValue* tmp = source.TestAndGetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET);
-Encoding encoding;
-if (tmp->IsNull() ||
+if (tmp == NULL)
-tmp->IsBinary() ||
+{
-!GetDicomEncoding(encoding, tmp->GetContent().c_str()))
+SetEncoding(defaultEncoding);
-{
+}
+else if (tmp->IsBinary())
+{
+LOG(ERROR) << "Invalid binary string in the SpecificCharacterSet (0008,0005) tag";
 throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
+else if (tmp->IsNull() ||
+tmp->GetContent().empty())
+{
+SetEncoding(defaultEncoding);
+}
 else
 {
-SetEncoding(encoding);
+Encoding encoding;
-}
-}
+if (GetDicomEncoding(encoding, tmp->GetContent().c_str()))
-else
+{
-{
+SetEncoding(encoding);
-SetEncoding(defaultEncoding);
+}
-}
+else
+{
-for (DicomMap::Map::const_iterator
+LOG(ERROR) << "Unsupported value for the SpecificCharacterSet (0008,0005) tag: \""
-it = source.map_.begin(); it != source.map_.end(); ++it)
+<< tmp->GetContent() << "\"";
-{
+throw OrthancException(ErrorCode_ParameterOutOfRange);
-if (it->first != DICOM_TAG_SPECIFIC_CHARACTER_SET &&
+}
-!it->second->IsNull())
+}
-{
-ReplacePlainString(it->first, it->second->GetContent());
+for (DicomMap::Map::const_iterator
-}
+it = source.map_.begin(); it != source.map_.end(); ++it)
+{
+if (it->first != DICOM_TAG_SPECIFIC_CHARACTER_SET &&
+!it->second->IsNull())
+{
+ReplacePlainString(it->first, it->second->GetContent());
+}
+}
+}
+catch (OrthancException&)
+{
+// Manually delete the PImpl to avoid a memory leak due to
+// throwing the exception in the constructor
+delete pimpl_;
+pimpl_ = NULL;
+throw;
 }
 }
 ParsedDicomFile::ParsedDicomFile(const DicomMap& map,
 throw OrthancException(ErrorCode_BadFileFormat);
 }
 }
-#if (ORTHANC_ENABLE_JPEG == 1 &&  \
+#if (ORTHANC_ENABLE_JPEG == 1 &&                \
 ORTHANC_ENABLE_PNG == 1)
 void ParsedDicomFile::EmbedImage(const std::string& mime,
 const std::string& content)
 {
 if (mime == "image/png")
 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json,
 DicomFromJsonFlags flags)
 {
-	const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers) ? true : false;
+const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers) ? true : false;
-	const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme) ? true : false;
+const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme) ? true : false;
 std::auto_ptr<ParsedDicomFile> result(new ParsedDicomFile(generateIdentifiers));
 result->SetEncoding(FromDcmtkBridge::ExtractEncoding(json, GetDefaultDicomEncoding()));
 const Json::Value::Members tags = json.getMemberNames();

Mercurial > hg > orthanc

comparison Core/DicomParsing/ParsedDicomFile.cpp @ 2445:6e5bc5c6d1a4