Mercurial > hg > orthanc
comparison Core/DicomFormat/DicomMap.cpp @ 2013:f6e68c0c2737
fix for msvc
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 13 Jun 2016 10:26:56 +0200 |
parents | dc82c754dcaa |
children | a3a65de1840f |
comparison
equal
deleted
inserted
replaced
2012:50b9bc19dc62 | 2013:f6e68c0c2737 |
---|---|
533 | 533 |
534 case ValueRepresentation_OtherByte: | 534 case ValueRepresentation_OtherByte: |
535 return true; | 535 return true; |
536 | 536 |
537 case ValueRepresentation_OtherDouble: | 537 case ValueRepresentation_OtherDouble: |
538 return value.size() <= static_cast<size_t>((1llu << 32) - 8); | 538 return value.size() <= (static_cast<uint64_t>(1) << 32) - 8; |
539 | 539 |
540 case ValueRepresentation_OtherFloat: | 540 case ValueRepresentation_OtherFloat: |
541 return value.size() <= static_cast<size_t>((1llu << 32) - 4); | 541 return value.size() <= (static_cast<uint64_t>(1) << 32) - 4; |
542 | 542 |
543 case ValueRepresentation_OtherLong: | 543 case ValueRepresentation_OtherLong: |
544 return true; | 544 return true; |
545 | 545 |
546 case ValueRepresentation_OtherWord: | 546 case ValueRepresentation_OtherWord: |
566 | 566 |
567 case ValueRepresentation_Time: | 567 case ValueRepresentation_Time: |
568 return value.size() <= 28; | 568 return value.size() <= 28; |
569 | 569 |
570 case ValueRepresentation_UnlimitedCharacters: | 570 case ValueRepresentation_UnlimitedCharacters: |
571 return value.size() <= static_cast<size_t>((1llu << 32) - 2); | 571 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2; |
572 | 572 |
573 case ValueRepresentation_UniqueIdentifier: | 573 case ValueRepresentation_UniqueIdentifier: |
574 return value.size() <= 64; | 574 return value.size() <= 64; |
575 | 575 |
576 case ValueRepresentation_UnsignedLong: | 576 case ValueRepresentation_UnsignedLong: |
578 | 578 |
579 case ValueRepresentation_Unknown: | 579 case ValueRepresentation_Unknown: |
580 return true; | 580 return true; |
581 | 581 |
582 case ValueRepresentation_UniversalResource: | 582 case ValueRepresentation_UniversalResource: |
583 return value.size() <= static_cast<size_t>((1llu << 32) - 2); | 583 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2; |
584 | 584 |
585 case ValueRepresentation_UnsignedShort: | 585 case ValueRepresentation_UnsignedShort: |
586 return value.size() == 2; | 586 return value.size() == 2; |
587 | 587 |
588 case ValueRepresentation_UnlimitedText: | 588 case ValueRepresentation_UnlimitedText: |
589 return value.size() <= static_cast<size_t>((1llu << 32) - 2); | 589 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2; |
590 | 590 |
591 default: | 591 default: |
592 // Assume unsupported tags are OK | 592 // Assume unsupported tags are OK |
593 return true; | 593 return true; |
594 } | 594 } |