comparison Core/DicomParsing/DicomWebJsonVisitor.cpp @ 3457:9ea218c90057

merge
author Alain Mazy <alain@mazy.be>
date Wed, 03 Jul 2019 10:31:06 +0200
parents b3bdd6dc10f2
children 418a89acef3b
comparison
equal deleted inserted replaced
3456:ca3ac0f210d6 3457:9ea218c90057
556 556
557 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET && 557 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET &&
558 tokens.size() > 1 && 558 tokens.size() > 1 &&
559 tokens[0].empty()) 559 tokens[0].empty())
560 { 560 {
561 std::string s = tokens[1]; 561 // Specific character set with code extension: Remove the
562 tokens.clear(); 562 // first element from the vector of encodings
563 tokens.push_back(s); 563 tokens.erase(tokens.begin());
564 } 564 }
565 565
566 node[KEY_VALUE] = Json::arrayValue; 566 node[KEY_VALUE] = Json::arrayValue;
567 for (size_t i = 0; i < tokens.size(); i++) 567 for (size_t i = 0; i < tokens.size(); i++)
568 { 568 {