orthanc: Core/DicomFormat/DicomImageInformation.cpp annotate

annotate Core/DicomFormat/DicomImageInformation.cpp @ 3749:edabdf07ee83

replacing deprecated std::auto_ptr by boost::movelib in C++ plugin wrapper

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 16 Mar 2020 11:13:30 +0100
parents	2a170a8f1faf
children

rev	line source
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1206 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3519 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	23 *
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "../PrecompiledHeaders.h"
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #ifndef NOMINMAX
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #define NOMINMAX
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #endif
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 #include "DicomImageInformation.h"
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	42 #include "../Compatibility.h"
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include "../OrthancException.h"
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	44 #include "../Toolbox.h"
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <boost/lexical_cast.hpp>
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <limits>
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <cassert>
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 #include <stdio.h>
2870 716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	49 #include <memory>
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 namespace Orthanc
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 DicomImageInformation::DicomImageInformation(const DicomMap& values)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 unsigned int pixelRepresentation;
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 unsigned int planarConfiguration = 0;
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 try
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	60 std::string p = values.GetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION).GetContent();
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	61 Toolbox::ToUpperCase(p);
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	62
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	63 if (p == "RGB")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	64 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	65 photometric_ = PhotometricInterpretation_RGB;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	66 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	67 else if (p == "MONOCHROME1")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	68 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	69 photometric_ = PhotometricInterpretation_Monochrome1;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	70 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	71 else if (p == "MONOCHROME2")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	72 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	73 photometric_ = PhotometricInterpretation_Monochrome2;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	74 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	75 else if (p == "PALETTE COLOR")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	76 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	77 photometric_ = PhotometricInterpretation_Palette;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	78 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	79 else if (p == "HSV")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	80 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	81 photometric_ = PhotometricInterpretation_HSV;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	82 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	83 else if (p == "ARGB")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	84 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	85 photometric_ = PhotometricInterpretation_ARGB;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	86 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	87 else if (p == "CMYK")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	88 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	89 photometric_ = PhotometricInterpretation_CMYK;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	90 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	91 else if (p == "YBR_FULL")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	92 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	93 photometric_ = PhotometricInterpretation_YBRFull;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	94 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	95 else if (p == "YBR_FULL_422")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	96 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	97 photometric_ = PhotometricInterpretation_YBRFull422;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	98 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	99 else if (p == "YBR_PARTIAL_420")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	100 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	101 photometric_ = PhotometricInterpretation_YBRPartial420;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	102 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	103 else if (p == "YBR_PARTIAL_422")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	104 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	105 photometric_ = PhotometricInterpretation_YBRPartial422;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	106 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	107 else if (p == "YBR_ICT")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	108 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	109 photometric_ = PhotometricInterpretation_YBR_ICT;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	110 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	111 else if (p == "YBR_RCT")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	112 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	113 photometric_ = PhotometricInterpretation_YBR_RCT;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	114 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	115 else
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	116 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	117 photometric_ = PhotometricInterpretation_Unknown;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	118 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	119
3519 fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3060 diff changeset	120 values.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(width_); // in some US images, we've seen tag values of "800\0"; that's why we parse the 'first' value
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3060 diff changeset	121 values.GetValue(DICOM_TAG_ROWS).ParseFirstUnsignedInteger(height_);
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3060 diff changeset	122
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	123 bitsAllocated_ = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_BITS_ALLOCATED).GetContent());
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 try
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127 samplesPerPixel_ = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_SAMPLES_PER_PIXEL).GetContent());
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	128 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	129 catch (OrthancException&)
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	130 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	131 samplesPerPixel_ = 1; // Assume 1 color channel
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	132 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	133
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	134 try
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	135 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	136 bitsStored_ = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_BITS_STORED).GetContent());
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 catch (OrthancException&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 bitsStored_ = bitsAllocated_;
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 try
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	145 highBit_ = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_HIGH_BIT).GetContent());
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 catch (OrthancException&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 highBit_ = bitsStored_ - 1;
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 try
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	154 pixelRepresentation = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_PIXEL_REPRESENTATION).GetContent());
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 catch (OrthancException&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 pixelRepresentation = 0; // Assume unsigned pixels
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 if (samplesPerPixel_ > 1)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 // The "Planar Configuration" is only set when "Samples per Pixels" is greater than 1
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	164 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.7.6.3.1.3
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 try
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	167 planarConfiguration = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_PLANAR_CONFIGURATION).GetContent());
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 catch (OrthancException&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 planarConfiguration = 0; // Assume interleaved color channels
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 catch (boost::bad_lexical_cast&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 throw OrthancException(ErrorCode_NotImplemented);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 catch (OrthancException&)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 throw OrthancException(ErrorCode_NotImplemented);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	184 if (values.HasTag(DICOM_TAG_NUMBER_OF_FRAMES))
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 {
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	186 try
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	187 {
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	188 numberOfFrames_ = boost::lexical_cast<unsigned int>(values.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	189 }
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	190 catch (boost::bad_lexical_cast&)
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	191 {
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	192 throw OrthancException(ErrorCode_NotImplemented);
feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	193 }
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 }
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	195 else
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 {
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2279 diff changeset	197 numberOfFrames_ = 1;
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	200 if (bitsAllocated_ != 8 && bitsAllocated_ != 16 &&
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	201 bitsAllocated_ != 24 && bitsAllocated_ != 32)
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 {
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	203 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: " + boost::lexical_cast<std::string>(bitsAllocated_) + " bits allocated");
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	204 }
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	205 else if (numberOfFrames_ == 0)
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	206 {
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	207 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported (no frames)");
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	208 }
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	209 else if (planarConfiguration != 0 && planarConfiguration != 1)
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	210 {
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	211 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: planar configuration is " + boost::lexical_cast<std::string>(planarConfiguration));
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 if (samplesPerPixel_ == 0)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 {
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	216 throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: samples per pixel is 0");
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218
860 80c7e53a69b5 bugfix Sebastien Jodogne <s.jodogne@gmail.com> parents: 857 diff changeset	219 bytesPerValue_ = bitsAllocated_ / 8;
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 isPlanar_ = (planarConfiguration != 0 ? true : false);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 isSigned_ = (pixelRepresentation != 0 ? true : false);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	224
2870 716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	225 DicomImageInformation* DicomImageInformation::Clone() const
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	226 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	227 std::unique_ptr<DicomImageInformation> target(new DicomImageInformation);
2870 716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	228 target->width_ = width_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	229 target->height_ = height_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	230 target->samplesPerPixel_ = samplesPerPixel_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	231 target->numberOfFrames_ = numberOfFrames_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	232 target->isPlanar_ = isPlanar_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	233 target->isSigned_ = isSigned_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	234 target->bytesPerValue_ = bytesPerValue_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	235 target->bitsAllocated_ = bitsAllocated_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	236 target->bitsStored_ = bitsStored_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	237 target->highBit_ = highBit_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	238 target->photometric_ = photometric_;
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	239
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	240 return target.release();
716dd24974ef DicomImageInformation::Clone() am@osimis.io parents: 2838 diff changeset	241 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	242
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	243 bool DicomImageInformation::ExtractPixelFormat(PixelFormat& format,
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	244 bool ignorePhotometricInterpretation) const
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	245 {
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	246 if (photometric_ == PhotometricInterpretation_Palette)
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	247 {
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	248 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	249 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	250 format = PixelFormat_RGB24;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	251 return true;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	252 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	253
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	254 if (GetBitsStored() == 16 && GetChannelCount() == 1 && !IsSigned())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	255 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	256 format = PixelFormat_RGB48;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	257 return true;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	258 }
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	259 }
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2416 diff changeset	260
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	261 if (ignorePhotometricInterpretation \|\|
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	262 photometric_ == PhotometricInterpretation_Monochrome1 \|\|
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	263 photometric_ == PhotometricInterpretation_Monochrome2)
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	264 {
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	265 if (GetBitsStored() == 8 && GetChannelCount() == 1 && !IsSigned())
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	266 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	267 format = PixelFormat_Grayscale8;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	268 return true;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	269 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	270
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	271 if (GetBitsAllocated() == 16 && GetChannelCount() == 1 && !IsSigned())
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	272 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	273 format = PixelFormat_Grayscale16;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	274 return true;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	275 }
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	276
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	277 if (GetBitsAllocated() == 16 && GetChannelCount() == 1 && IsSigned())
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	278 {
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	279 format = PixelFormat_SignedGrayscale16;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	280 return true;
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	281 }
2838 f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	282
f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	283 if (GetBitsAllocated() == 32 && GetChannelCount() == 1 && !IsSigned())
f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	284 {
f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	285 format = PixelFormat_Grayscale32;
f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	286 return true;
f3a2d109e361 new orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	287 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	288 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	289
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	290 if (GetBitsStored() == 8 &&
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	291 GetChannelCount() == 3 &&
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	292 !IsSigned() &&
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	293 (ignorePhotometricInterpretation \|\| photometric_ == PhotometricInterpretation_RGB))
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	294 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	295 format = PixelFormat_RGB24;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	296 return true;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	297 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	298
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	299 return false;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	300 }
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	301
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	302
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	303 size_t DicomImageInformation::GetFrameSize() const
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	304 {
3007 c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	305 return (GetHeight() *
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	306 GetWidth() *
c9f93628215a more error details am@osimis.io parents: 2870 diff changeset	307 GetBytesPerValue() *
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	308 GetChannelCount());
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	309 }
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 }

Mercurial > hg > orthanc

annotate Core/DicomFormat/DicomImageInformation.cpp @ 3749:edabdf07ee83