orthanc: Core/DicomParsing/Internals/DicomImageDecoder.cpp annotate

annotate Core/DicomParsing/Internals/DicomImageDecoder.cpp @ 3508:70524b4acc72

Name of temporary files now include the process ID to ease design of scripts cleaning /tmp

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 29 Aug 2019 11:41:26 +0200
parents	4e43e67f8ecf
children	8c66c9c2257b

rev	line source
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
48016722c770 refactoring 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: 1826 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
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
48016722c770 refactoring 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
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	34 #include "../../PrecompiledHeaders.h"
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "DicomImageDecoder.h"
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	37
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	38 /*=========================================================================
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	39
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	40 This file is based on portions of the following project
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	41 (cf. function "DecodePsmctRle1()"):
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	42
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	43 Program: GDCM (Grassroots DICOM). A DICOM library
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	44 Module: http://gdcm.sourceforge.net/Copyright.html
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	45
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	46 Copyright (c) 2006-2011 Mathieu Malaterre
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	47 Copyright (c) 1993-2005 CREATIS
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	48 (CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	49 All rights reserved.
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	50
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	51 Redistribution and use in source and binary forms, with or without
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	52 modification, are permitted provided that the following conditions are met:
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	53
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	54 * Redistributions of source code must retain the above copyright notice,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	55 this list of conditions and the following disclaimer.
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	56
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	57 * Redistributions in binary form must reproduce the above copyright notice,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	58 this list of conditions and the following disclaimer in the documentation
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	59 and/or other materials provided with the distribution.
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	60
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	61 * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	62 contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	63 endorse or promote products derived from this software without specific
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	64 prior written permission.
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	65
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	66 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	67 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	68 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	69 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	70 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	71 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	72 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	73 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	74 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	75 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	76
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	77 =========================================================================*/
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	78
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	79
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	80 #include "../../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	81 #include "../../OrthancException.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	82 #include "../../Images/Image.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	83 #include "../../Images/ImageProcessing.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	84 #include "../../DicomFormat/DicomIntegerPixelAccessor.h"
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 #include "../ToDcmtkBridge.h"
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	86 #include "../FromDcmtkBridge.h"
1824 b530c3dfe2a6 refactoring image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	87 #include "../ParsedDicomFile.h"
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	89 #if ORTHANC_ENABLE_PNG == 1
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	90 # include "../../Images/PngWriter.h"
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	91 #endif
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	92
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	93 #if ORTHANC_ENABLE_JPEG == 1
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	94 # include "../../Images/JpegWriter.h"
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	95 #endif
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	96 #include "../../Images/PamWriter.h"
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	97
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	98 #include <boost/lexical_cast.hpp>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	99
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	100 #include <dcmtk/dcmdata/dcdeftag.h>
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	101 #include <dcmtk/dcmdata/dcfilefo.h>
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	102 #include <dcmtk/dcmdata/dcrleccd.h>
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	103 #include <dcmtk/dcmdata/dcrlecp.h>
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	104 #include <dcmtk/dcmdata/dcrlerp.h>
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	105
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	106 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	107 # include <dcmtk/dcmjpeg/djrplol.h>
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	108 # include <dcmtk/dcmjpls/djcodecd.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	109 # include <dcmtk/dcmjpls/djcparam.h>
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	110 # include <dcmtk/dcmjpls/djrparam.h>
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 #endif
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	113 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	114 # include <dcmtk/dcmjpeg/djcodecd.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	115 # include <dcmtk/dcmjpeg/djcparam.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	116 # include <dcmtk/dcmjpeg/djdecbas.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	117 # include <dcmtk/dcmjpeg/djdecext.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	118 # include <dcmtk/dcmjpeg/djdeclol.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	119 # include <dcmtk/dcmjpeg/djdecpro.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	120 # include <dcmtk/dcmjpeg/djdecsps.h>
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	121 # include <dcmtk/dcmjpeg/djdecsv1.h>
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	122 # include <dcmtk/dcmjpeg/djrploss.h>
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	123 #endif
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	124
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	125 #if DCMTK_VERSION_NUMBER <= 360
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	126 # define EXS_JPEGProcess1 EXS_JPEGProcess1TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	127 # define EXS_JPEGProcess2_4 EXS_JPEGProcess2_4TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	128 # define EXS_JPEGProcess6_8 EXS_JPEGProcess6_8TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	129 # define EXS_JPEGProcess10_12 EXS_JPEGProcess10_12TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	130 # define EXS_JPEGProcess14 EXS_JPEGProcess14TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	131 # define EXS_JPEGProcess14SV1 EXS_JPEGProcess14SV1TransferSyntax
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	132 #endif
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 namespace Orthanc
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	136 static const DicomTag DICOM_TAG_CONTENT(0x07a1, 0x100a);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	137 static const DicomTag DICOM_TAG_COMPRESSION_TYPE(0x07a1, 0x1011);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	138
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	139
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	140 bool DicomImageDecoder::IsPsmctRle1(DcmDataset& dataset)
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	141 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	142 DcmElement* e;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	143 char* c;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	144
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	145 // Check whether the DICOM instance contains an image encoded with
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	146 // the PMSCT_RLE1 scheme.
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	147 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_COMPRESSION_TYPE), e).good() \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	148 e == NULL \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	149 !e->isaString() \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	150 !e->getString(c).good() \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	151 c == NULL \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	152 strcmp("PMSCT_RLE1", c))
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	153 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	154 return false;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	155 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	156 else
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	157 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	158 return true;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	159 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	160 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	161
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	162
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	163 bool DicomImageDecoder::DecodePsmctRle1(std::string& output,
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	164 DcmDataset& dataset)
846 715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	165 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	166 // Check whether the DICOM instance contains an image encoded with
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	167 // the PMSCT_RLE1 scheme.
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	168 if (!IsPsmctRle1(dataset))
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	169 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	170 return false;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	171 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	172
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	173 // OK, this is a custom RLE encoding from Philips. Get the pixel
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	174 // data from the appropriate private DICOM tag.
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	175 Uint8* pixData = NULL;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	176 DcmElement* e;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	177 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_CONTENT), e).good() \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	178 e == NULL \|\|
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	179 e->getUint8Array(pixData) != EC_Normal)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	180 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	181 return false;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	182 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	183
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	184 // The "unsigned" below IS VERY IMPORTANT
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	185 const uint8_t* inbuffer = reinterpret_cast<const uint8_t*>(pixData);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	186 const size_t length = e->getLength();
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	187
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	188 /**
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	189 * The code below is an adaptation of a sample code for GDCM by
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	190 * Mathieu Malaterre (under a BSD license).
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	191 * http://gdcm.sourceforge.net/html/rle2img_8cxx-example.html
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	192 **/
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	193
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	194 // RLE pass
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	195 std::vector<uint8_t> temp;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	196 temp.reserve(length);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	197 for (size_t i = 0; i < length; i++)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	198 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	199 if (inbuffer[i] == 0xa5)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	200 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	201 temp.push_back(inbuffer[i+2]);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	202 for (uint8_t repeat = inbuffer[i + 1]; repeat != 0; repeat--)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	203 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	204 temp.push_back(inbuffer[i+2]);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	205 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	206 i += 2;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	207 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	208 else
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	209 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	210 temp.push_back(inbuffer[i]);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	211 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	212 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	213
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	214 // Delta encoding pass
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	215 uint16_t delta = 0;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	216 output.clear();
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	217 output.reserve(temp.size());
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	218 for (size_t i = 0; i < temp.size(); i++)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	219 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	220 uint16_t value;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	221
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	222 if (temp[i] == 0x5a)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	223 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	224 uint16_t v1 = temp[i + 1];
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	225 uint16_t v2 = temp[i + 2];
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	226 value = (v2 << 8) + v1;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	227 i += 2;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	228 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	229 else
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	230 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	231 value = delta + (int8_t) temp[i];
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	232 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	233
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	234 output.push_back(value & 0xff);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	235 output.push_back(value >> 8);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	236 delta = value;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	237 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	238
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	239 if (output.size() % 2)
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	240 {
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	241 output.resize(output.size() - 1);
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	242 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	243
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	244 return true;
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	245 }
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	246
715ab7674993 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 845 diff changeset	247
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	248 class DicomImageDecoder::ImageSource
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	249 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	250 private:
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	251 std::string psmct_;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	252 std::auto_ptr<DicomIntegerPixelAccessor> slowAccessor_;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	253
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	254 public:
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	255 void Setup(DcmDataset& dataset,
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	256 unsigned int frame)
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	257 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	258 psmct_.clear();
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	259 slowAccessor_.reset(NULL);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	260
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	261 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	262
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	263 DicomMap m;
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	264 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	265
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	266 /**
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	267 * Create an accessor to the raw values of the DICOM image.
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	268 **/
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	269
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	270 DcmElement* e;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	271 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() &&
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	272 e != NULL)
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	273 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	274 Uint8* pixData = NULL;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	275 if (e->getUint8Array(pixData) == EC_Normal)
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	276 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	277 slowAccessor_.reset(new DicomIntegerPixelAccessor(m, pixData, e->getLength()));
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	278 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	279 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	280 else if (DecodePsmctRle1(psmct_, dataset))
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	281 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	282 LOG(INFO) << "The PMSCT_RLE1 decoding has succeeded";
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	283 Uint8* pixData = NULL;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	284 if (psmct_.size() > 0)
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	285 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	286 pixData = reinterpret_cast<Uint8*>(&psmct_[0]);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	287 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	288
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	289 slowAccessor_.reset(new DicomIntegerPixelAccessor(m, pixData, psmct_.size()));
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	290 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	291
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	292 if (slowAccessor_.get() == NULL)
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	293 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	294 throw OrthancException(ErrorCode_BadFileFormat);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	295 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	296
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	297 slowAccessor_->SetCurrentFrame(frame);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	298 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	299
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	300 unsigned int GetWidth() const
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	301 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	302 assert(slowAccessor_.get() != NULL);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	303 return slowAccessor_->GetInformation().GetWidth();
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	304 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	305
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	306 unsigned int GetHeight() const
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	307 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	308 assert(slowAccessor_.get() != NULL);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	309 return slowAccessor_->GetInformation().GetHeight();
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	310 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	311
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	312 unsigned int GetChannelCount() const
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	313 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	314 assert(slowAccessor_.get() != NULL);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	315 return slowAccessor_->GetInformation().GetChannelCount();
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	316 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	317
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	318 const DicomIntegerPixelAccessor& GetAccessor() const
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	319 {
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	320 assert(slowAccessor_.get() != NULL);
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	321 return *slowAccessor_;
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	322 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	323
1190 851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	324 unsigned int GetSize() const
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	325 {
1190 851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	326 assert(slowAccessor_.get() != NULL);
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	327 return slowAccessor_->GetSize();
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	328 }
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	329 };
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	330
b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	331
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	332 ImageAccessor* DicomImageDecoder::CreateImage(DcmDataset& dataset,
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	333 bool ignorePhotometricInterpretation)
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 {
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	335 DicomMap m;
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	336 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	338 DicomImageInformation info(m);
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	339 PixelFormat format;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	340
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	341 if (!info.ExtractPixelFormat(format, ignorePhotometricInterpretation))
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 {
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	343 LOG(WARNING) << "Unsupported DICOM image: " << info.GetBitsStored()
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	344 << "bpp, " << info.GetChannelCount() << " channels, "
860 80c7e53a69b5 bugfix Sebastien Jodogne <s.jodogne@gmail.com> parents: 859 diff changeset	345 << (info.IsSigned() ? "signed" : "unsigned")
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1190 diff changeset	346 << (info.IsPlanar() ? ", planar, " : ", non-planar, ")
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1190 diff changeset	347 << EnumerationToString(info.GetPhotometricInterpretation())
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1190 diff changeset	348 << " photometric interpretation";
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 throw OrthancException(ErrorCode_NotImplemented);
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 }
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 863 diff changeset	351
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1944 diff changeset	352 return new Image(format, info.GetWidth(), info.GetHeight(), false);
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 }
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	356 template <typename PixelType>
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	357 static void CopyPixels(ImageAccessor& target,
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	358 const DicomIntegerPixelAccessor& source)
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	359 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	360 const PixelType minValue = std::numeric_limits<PixelType>::min();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	361 const PixelType maxValue = std::numeric_limits<PixelType>::max();
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	362
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: 852 diff changeset	363 for (unsigned int y = 0; y < source.GetInformation().GetHeight(); y++)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	364 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	365 PixelType* pixel = reinterpret_cast<PixelType*>(target.GetRow(y));
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: 852 diff changeset	366 for (unsigned int x = 0; x < source.GetInformation().GetWidth(); x++)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	367 {
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: 852 diff changeset	368 for (unsigned int c = 0; c < source.GetInformation().GetChannelCount(); c++, pixel++)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	369 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	370 int32_t v = source.GetValue(x, y, c);
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	371 if (v < static_cast<int32_t>(minValue))
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	372 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	373 *pixel = minValue;
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	374 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	375 else if (v > static_cast<int32_t>(maxValue))
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	376 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	377 *pixel = maxValue;
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	378 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	379 else
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	380 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	381 *pixel = static_cast<PixelType>(v);
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	382 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	383 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	384 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	385 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	386 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	387
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	388
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	389 static ImageAccessor* DecodeLookupTable(std::auto_ptr<ImageAccessor>& target,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	390 const DicomImageInformation& info,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	391 DcmDataset& dataset,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	392 const uint8_t* pixelData,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	393 unsigned long pixelLength)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	394 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	395 LOG(INFO) << "Decoding a lookup table";
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	396
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	397 OFString r, g, b;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	398 PixelFormat format;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	399 const uint16_t* lutRed = NULL;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	400 const uint16_t* lutGreen = NULL;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	401 const uint16_t* lutBlue = NULL;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	402 unsigned long rc = 0;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	403 unsigned long gc = 0;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	404 unsigned long bc = 0;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	405
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	406 if (pixelData == NULL &&
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	407 !dataset.findAndGetUint8Array(DCM_PixelData, pixelData, &pixelLength).good())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	408 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	409 throw OrthancException(ErrorCode_NotImplemented);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	410 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	411
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	412 if (info.IsPlanar() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	413 info.GetNumberOfFrames() != 1 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	414 !info.ExtractPixelFormat(format, false) \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	415 !dataset.findAndGetOFStringArray(DCM_BluePaletteColorLookupTableDescriptor, b).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	416 !dataset.findAndGetOFStringArray(DCM_GreenPaletteColorLookupTableDescriptor, g).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	417 !dataset.findAndGetOFStringArray(DCM_RedPaletteColorLookupTableDescriptor, r).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	418 !dataset.findAndGetUint16Array(DCM_BluePaletteColorLookupTableData, lutBlue, &bc).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	419 !dataset.findAndGetUint16Array(DCM_GreenPaletteColorLookupTableData, lutGreen, &gc).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	420 !dataset.findAndGetUint16Array(DCM_RedPaletteColorLookupTableData, lutRed, &rc).good() \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	421 r != g \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	422 r != b \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	423 g != b \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	424 lutRed == NULL \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	425 lutGreen == NULL \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	426 lutBlue == NULL \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	427 pixelData == NULL)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	428 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	429 throw OrthancException(ErrorCode_NotImplemented);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	430 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	431
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	432 switch (format)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	433 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	434 case PixelFormat_RGB24:
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	435 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	436 if (r != "256\\0\\16" \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	437 rc != 256 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	438 gc != 256 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	439 bc != 256 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	440 pixelLength != target->GetWidth() * target->GetHeight())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	441 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	442 throw OrthancException(ErrorCode_NotImplemented);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	443 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	444
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	445 const uint8_t* source = reinterpret_cast<const uint8_t*>(pixelData);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	446
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	447 for (unsigned int y = 0; y < target->GetHeight(); y++)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	448 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	449 uint8_t* p = reinterpret_cast<uint8_t*>(target->GetRow(y));
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	450
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	451 for (unsigned int x = 0; x < target->GetWidth(); x++)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	452 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	453 p[0] = lutRed[*source] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	454 p[1] = lutGreen[*source] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	455 p[2] = lutBlue[*source] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	456 source++;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	457 p += 3;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	458 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	459 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	460
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	461 return target.release();
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	462 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	463
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	464 case PixelFormat_RGB48:
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	465 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	466 if (r != "0\\0\\16" \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	467 rc != 65536 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	468 gc != 65536 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	469 bc != 65536 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	470 pixelLength != 2 * target->GetWidth() * target->GetHeight())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	471 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	472 throw OrthancException(ErrorCode_NotImplemented);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	473 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	474
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	475 const uint16_t* source = reinterpret_cast<const uint16_t*>(pixelData);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	476
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	477 for (unsigned int y = 0; y < target->GetHeight(); y++)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	478 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	479 uint16_t* p = reinterpret_cast<uint16_t*>(target->GetRow(y));
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	480
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	481 for (unsigned int x = 0; x < target->GetWidth(); x++)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	482 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	483 p[0] = lutRed[*source];
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	484 p[1] = lutGreen[*source];
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	485 p[2] = lutBlue[*source];
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	486 source++;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	487 p += 3;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	488 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	489 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	490
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	491 return target.release();
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	492 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	493
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	494 default:
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	495 break;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	496 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	497
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	498 throw OrthancException(ErrorCode_InternalError);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	499 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	500
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	501
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	502 ImageAccessor* DicomImageDecoder::DecodeUncompressedImage(DcmDataset& dataset,
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	503 unsigned int frame)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	504 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	505 /**
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	506 * Create the target image.
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	507 **/
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	508
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	509 std::auto_ptr<ImageAccessor> target(CreateImage(dataset, false));
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	510
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	511 ImageSource source;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	512 source.Setup(dataset, frame);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	513
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	514 if (source.GetWidth() != target->GetWidth() \|\|
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	515 source.GetHeight() != target->GetHeight())
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	516 {
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	517 throw OrthancException(ErrorCode_InternalError);
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	518 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	519
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	520
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	521 /**
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	522 * Deal with lookup tables
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	523 **/
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	524
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	525 const DicomImageInformation& info = source.GetAccessor().GetInformation();
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	526
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	527 if (info.GetPhotometricInterpretation() == PhotometricInterpretation_Palette)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	528 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	529 return DecodeLookupTable(target, info, dataset, NULL, 0);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	530 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	531
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	532
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	533 /**
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	534 * If the format of the DICOM buffer is natively supported, use a
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	535 * direct access to copy its values.
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	536 **/
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	537
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	538 bool fastVersionSuccess = false;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	539 PixelFormat sourceFormat;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	540 if (!info.IsPlanar() &&
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	541 info.ExtractPixelFormat(sourceFormat, false))
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	542 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	543 try
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	544 {
1190 851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	545 size_t frameSize = info.GetHeight() * info.GetWidth() * GetBytesPerPixel(sourceFormat);
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	546 if ((frame + 1) * frameSize <= source.GetSize())
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	547 {
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	548 const uint8_t* buffer = reinterpret_cast<const uint8_t*>(source.GetAccessor().GetPixelData());
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	549
1190 851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	550 ImageAccessor sourceImage;
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	551 sourceImage.AssignReadOnly(sourceFormat,
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	552 info.GetWidth(),
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	553 info.GetHeight(),
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	554 info.GetWidth() * GetBytesPerPixel(sourceFormat),
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	555 buffer + frame * frameSize);
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	556
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	557 ImageProcessing::Convert(*target, sourceImage);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	558 ImageProcessing::ShiftRight(*target, info.GetShift());
1190 851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	559 fastVersionSuccess = true;
851a55d183c9 fix issue 22 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1015 diff changeset	560 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	561 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	562 catch (OrthancException&)
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	563 {
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	564 // Unsupported conversion, use the slow version
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	565 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	566 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	567
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	568 /**
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	569 * Slow version : loop over the DICOM buffer, storing its value
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	570 * into the target image.
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	571 **/
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	572
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	573 if (!fastVersionSuccess)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	574 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	575 switch (target->GetFormat())
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	576 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	577 case PixelFormat_RGB24:
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	578 case PixelFormat_RGBA32:
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	579 case PixelFormat_Grayscale8:
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	580 CopyPixels<uint8_t>(*target, source.GetAccessor());
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	581 break;
860 80c7e53a69b5 bugfix Sebastien Jodogne <s.jodogne@gmail.com> parents: 859 diff changeset	582
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	583 case PixelFormat_Grayscale16:
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	584 CopyPixels<uint16_t>(*target, source.GetAccessor());
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	585 break;
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	586
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	587 case PixelFormat_SignedGrayscale16:
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	588 CopyPixels<int16_t>(*target, source.GetAccessor());
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	589 break;
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	590
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	591 default:
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	592 throw OrthancException(ErrorCode_InternalError);
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	593 }
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	594 }
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	595
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	596 return target.release();
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	597 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	598
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	599
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	600 ImageAccessor* DicomImageDecoder::ApplyCodec
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	601 (const DcmCodec& codec,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	602 const DcmCodecParameter& parameters,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	603 const DcmRepresentationParameter& representationParameter,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	604 DcmDataset& dataset,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	605 unsigned int frame)
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	606 {
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	607 DcmPixelSequence* pixelSequence = FromDcmtkBridge::GetPixelSequence(dataset);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	608 if (pixelSequence == NULL)
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	609 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	610 throw OrthancException(ErrorCode_BadFileFormat);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	611 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	612
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	613 DicomMap m;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	614 FromDcmtkBridge::ExtractDicomSummary(m, dataset);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	615 DicomImageInformation info(m);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	616
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	617 std::auto_ptr<ImageAccessor> target(CreateImage(dataset, true));
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 Uint32 startFragment = 0; // Default
48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 OFString decompressedColorModel; // Out
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	621
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	622 OFCondition c;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	623
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	624 if (info.GetPhotometricInterpretation() == PhotometricInterpretation_Palette &&
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	625 info.GetChannelCount() == 1)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	626 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	627 std::string uncompressed;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	628 uncompressed.resize(info.GetWidth() * info.GetHeight() * info.GetBytesPerValue());
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	630 if (uncompressed.size() == 0 \|\|
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	631 !codec.decodeFrame(&representationParameter,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	632 pixelSequence, &parameters,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	633 &dataset, frame, startFragment, &uncompressed[0],
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	634 uncompressed.size(), decompressedColorModel).good())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	635 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	636 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	637 "Cannot decode a palette image");
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	638 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	639
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	640 return DecodeLookupTable(target, info, dataset,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	641 reinterpret_cast<const uint8_t*>(uncompressed.c_str()),
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	642 uncompressed.size());
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 }
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	644 else
554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	645 {
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	646 if (!codec.decodeFrame(&representationParameter,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	647 pixelSequence, &parameters,
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	648 &dataset, frame, startFragment, target->GetBuffer(),
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	649 target->GetSize(), decompressedColorModel).good())
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	650 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	651 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	652 "Cannot decode a non-palette image");
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	653 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	654
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	655 return target.release();
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	656 }
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 }
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	658
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	659
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	660 ImageAccessor* DicomImageDecoder::Decode(ParsedDicomFile& dicom,
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	661 unsigned int frame)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	662 {
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	663 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset();
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	664 E_TransferSyntax syntax = dataset.getOriginalXfer();
1824 b530c3dfe2a6 refactoring image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	665
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	666 /**
554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	667 * Deal with uncompressed, raw images.
554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	668 * http://support.dcmtk.org/docs/dcxfer_8h-source.html
554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	669 **/
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	670 if (syntax == EXS_Unknown \|\|
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	671 syntax == EXS_LittleEndianImplicit \|\|
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	672 syntax == EXS_BigEndianImplicit \|\|
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	673 syntax == EXS_LittleEndianExplicit \|\|
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	674 syntax == EXS_BigEndianExplicit)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	675 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	676 return DecodeUncompressedImage(dataset, frame);
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	677 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	678
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	679
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	680 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	681 /**
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	682 * Deal with JPEG-LS images.
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	683 **/
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	684
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	685 if (syntax == EXS_JPEGLSLossless \|\|
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	686 syntax == EXS_JPEGLSLossy)
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	687 {
2430 a6fab385b89e fix for dcmtk 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2423 diff changeset	688 // The (2, OFTrue) are the default parameters as found in DCMTK 3.6.2
a6fab385b89e fix for dcmtk 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2423 diff changeset	689 // http://support.dcmtk.org/docs/classDJLSRepresentationParameter.html
a6fab385b89e fix for dcmtk 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2423 diff changeset	690 DJLSRepresentationParameter representationParameter(2, OFTrue);
a6fab385b89e fix for dcmtk 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2423 diff changeset	691
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	692 DJLSCodecParameter parameters;
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	693 std::auto_ptr<DJLSDecoderBase> decoder;
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	694
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	695 switch (syntax)
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	696 {
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	697 case EXS_JPEGLSLossless:
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	698 LOG(INFO) << "Decoding a JPEG-LS lossless DICOM image";
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	699 decoder.reset(new DJLSLosslessDecoder);
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	700 break;
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	701
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	702 case EXS_JPEGLSLossy:
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	703 LOG(INFO) << "Decoding a JPEG-LS near-lossless DICOM image";
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	704 decoder.reset(new DJLSNearLosslessDecoder);
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	705 break;
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	706
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	707 default:
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	708 throw OrthancException(ErrorCode_InternalError);
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	709 }
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	710
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	711 return ApplyCodec(*decoder, parameters, representationParameter, dataset, frame);
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	712 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	713 #endif
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	714
852 5944b8b80842 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 851 diff changeset	715
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	716 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	717 /**
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	718 * Deal with JPEG images.
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	719 **/
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	720
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	721 if (syntax == EXS_JPEGProcess1 \|\| // DJDecoderBaseline
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	722 syntax == EXS_JPEGProcess2_4 \|\| // DJDecoderExtended
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	723 syntax == EXS_JPEGProcess6_8 \|\| // DJDecoderSpectralSelection (retired)
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	724 syntax == EXS_JPEGProcess10_12 \|\| // DJDecoderProgressive (retired)
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	725 syntax == EXS_JPEGProcess14 \|\| // DJDecoderLossless
1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	726 syntax == EXS_JPEGProcess14SV1) // DJDecoderP14SV1
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	727 {
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	728 // http://support.dcmtk.org/docs-snapshot/djutils_8h.html#a2a9695e5b6b0f5c45a64c7f072c1eb9d
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	729 DJCodecParameter parameters(
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	730 ECC_lossyYCbCr, // Mode for color conversion for compression, Unused for decompression
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	731 EDC_photometricInterpretation, // Perform color space conversion from YCbCr to RGB if DICOM photometric interpretation indicates YCbCr
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	732 EUC_default, // Mode for UID creation, unused for decompression
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	733 EPC_default); // Automatically determine whether color-by-plane is required from the SOP Class UID and decompressed photometric interpretation
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	734 DJ_RPLossy representationParameter;
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	735 std::auto_ptr<DJCodecDecoder> decoder;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	736
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	737 switch (syntax)
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	738 {
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	739 case EXS_JPEGProcess1:
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	740 LOG(INFO) << "Decoding a JPEG baseline (process 1) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	741 decoder.reset(new DJDecoderBaseline);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	742 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	743
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	744 case EXS_JPEGProcess2_4 :
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	745 LOG(INFO) << "Decoding a JPEG baseline (processes 2 and 4) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	746 decoder.reset(new DJDecoderExtended);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	747 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	748
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	749 case EXS_JPEGProcess6_8: // Retired
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	750 LOG(INFO) << "Decoding a JPEG spectral section, nonhierarchical (processes 6 and 8) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	751 decoder.reset(new DJDecoderSpectralSelection);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	752 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	753
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	754 case EXS_JPEGProcess10_12: // Retired
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	755 LOG(INFO) << "Decoding a JPEG full progression, nonhierarchical (processes 10 and 12) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	756 decoder.reset(new DJDecoderProgressive);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	757 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	758
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	759 case EXS_JPEGProcess14:
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	760 LOG(INFO) << "Decoding a JPEG lossless, nonhierarchical (process 14) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	761 decoder.reset(new DJDecoderLossless);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	762 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	763
1944 1a5e070a21c3 fix compilation against DCMTK 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	764 case EXS_JPEGProcess14SV1:
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	765 LOG(INFO) << "Decoding a JPEG lossless, nonhierarchical, first-order prediction (process 14 selection value 1) DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	766 decoder.reset(new DJDecoderP14SV1);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	767 break;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	768
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	769 default:
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	770 throw OrthancException(ErrorCode_InternalError);
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	771 }
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	772
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	773 return ApplyCodec(*decoder, parameters, representationParameter, dataset, frame);
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	774 }
852 5944b8b80842 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 851 diff changeset	775 #endif
5944b8b80842 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 851 diff changeset	776
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	777
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	778 if (syntax == EXS_RLELossless)
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	779 {
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	780 LOG(INFO) << "Decoding a RLE lossless DICOM image";
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	781 DcmRLECodecParameter parameters;
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	782 DcmRLECodecDecoder decoder;
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	783 DcmRLERepresentationParameter representationParameter;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	784 return ApplyCodec(decoder, parameters, representationParameter, dataset, frame);
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	785 }
1904 4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	786
4be8accf8768 clarifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 1903 diff changeset	787
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	788 /**
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	789 * This DICOM image format is not natively supported by
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	790 * Orthanc. As a last resort, try and decode it through DCMTK by
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	791 * converting its transfer syntax to Little Endian. This will
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	792 * result in higher memory consumption. This is actually the
8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	793 * second example of the following page:
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	794 * http://support.dcmtk.org/docs/mod_dcmjpeg.html#Examples
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	795 **/
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	796
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	797 {
1905 8b1baa2315b8 Huge speedup if decoding the family of JPEG transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	798 LOG(INFO) << "Decoding a compressed image by converting its transfer syntax to Little Endian";
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	799
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	800 std::auto_ptr<DcmDataset> converted(dynamic_cast<DcmDataset*>(dataset.clone()));
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	801 converted->chooseRepresentation(EXS_LittleEndianExplicit, NULL);
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	802
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	803 if (converted->canWriteXfer(EXS_LittleEndianExplicit))
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	804 {
1903 554ec8422ec5 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	805 return DecodeUncompressedImage(*converted, frame);
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	806 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	807 }
03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	808
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	809 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	810 "Cannot decode a DICOM image with the built-in decoder");
847 03ea55da7429 fully functional JPEG-LS conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 846 diff changeset	811 }
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	812
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	813
1015 f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	814 static bool IsColorImage(PixelFormat format)
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	815 {
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	816 return (format == PixelFormat_RGB24 \|\|
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	817 format == PixelFormat_RGBA32);
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	818 }
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	819
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	820
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	821 bool DicomImageDecoder::TruncateDecodedImage(std::auto_ptr<ImageAccessor>& image,
1824 b530c3dfe2a6 refactoring image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	822 PixelFormat format,
b530c3dfe2a6 refactoring image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	823 bool allowColorConversion)
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	824 {
1015 f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	825 // If specified, prevent the conversion between color and
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	826 // grayscale images
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	827 bool isSourceColor = IsColorImage(image->GetFormat());
1015 f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	828 bool isTargetColor = IsColorImage(format);
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	829
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	830 if (!allowColorConversion)
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	831 {
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	832 if (isSourceColor ^ isTargetColor)
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	833 {
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	834 return false;
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	835 }
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	836 }
f009f7c75069 fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	837
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	838 if (image->GetFormat() != format)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	839 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	840 // A conversion is required
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	841 std::auto_ptr<ImageAccessor> target
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	842 (new Image(format, image->GetWidth(), image->GetHeight(), false));
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	843 ImageProcessing::Convert(target, image);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	844 image = target;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	845 }
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	846
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	847 return true;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	848 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	849
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	850
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	851 bool DicomImageDecoder::PreviewDecodedImage(std::auto_ptr<ImageAccessor>& image)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	852 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	853 switch (image->GetFormat())
861 a546b05a43da fix PngWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 860 diff changeset	854 {
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	855 case PixelFormat_RGB24:
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	856 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	857 // Directly return color images without modification (RGB)
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	858 return true;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	859 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	860
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	861 case PixelFormat_RGB48:
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	862 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	863 std::auto_ptr<ImageAccessor> target
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	864 (new Image(PixelFormat_RGB24, image->GetWidth(), image->GetHeight(), false));
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	865 ImageProcessing::Convert(target, image);
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	866 image = target;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	867 return true;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	868 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	869
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	870 case PixelFormat_Grayscale8:
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	871 case PixelFormat_Grayscale16:
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	872 case PixelFormat_SignedGrayscale16:
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	873 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	874 // Grayscale image: Stretch its dynamics to the [0,255] range
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	875 int64_t a, b;
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	876 ImageProcessing::GetMinMaxIntegerValue(a, b, *image);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	877
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	878 if (a == b)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	879 {
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	880 ImageProcessing::Set(*image, 0);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	881 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	882 else
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	883 {
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	884 ImageProcessing::ShiftScale(*image, static_cast<float>(-a),
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	885 255.0f / static_cast<float>(b - a),
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	886 true /* TODO - Consider using "false" to speed up */);
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	887 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	888
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	889 // If the source image is not grayscale 8bpp, convert it
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	890 if (image->GetFormat() != PixelFormat_Grayscale8)
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	891 {
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	892 std::auto_ptr<ImageAccessor> target
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	893 (new Image(PixelFormat_Grayscale8, image->GetWidth(), image->GetHeight(), false));
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	894 ImageProcessing::Convert(target, image);
ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	895 image = target;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	896 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	897
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	898 return true;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	899 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 861 diff changeset	900
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	901 default:
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	902 throw OrthancException(ErrorCode_NotImplemented);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	903 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 858 diff changeset	904 }
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	905
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	906
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	907 void DicomImageDecoder::ApplyExtractionMode(std::auto_ptr<ImageAccessor>& image,
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	908 ImageExtractionMode mode,
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	909 bool invert)
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	910 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	911 if (image.get() == NULL)
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	912 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	913 throw OrthancException(ErrorCode_ParameterOutOfRange);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	914 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	915
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	916 bool ok = false;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	917
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	918 switch (mode)
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	919 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	920 case ImageExtractionMode_UInt8:
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	921 ok = TruncateDecodedImage(image, PixelFormat_Grayscale8, false);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	922 break;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	923
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	924 case ImageExtractionMode_UInt16:
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	925 ok = TruncateDecodedImage(image, PixelFormat_Grayscale16, false);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	926 break;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	927
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	928 case ImageExtractionMode_Int16:
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	929 ok = TruncateDecodedImage(image, PixelFormat_SignedGrayscale16, false);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	930 break;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	931
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	932 case ImageExtractionMode_Preview:
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	933 ok = PreviewDecodedImage(image);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	934 break;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	935
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	936 default:
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	937 throw OrthancException(ErrorCode_ParameterOutOfRange);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	938 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	939
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	940 if (ok)
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	941 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	942 assert(image.get() != NULL);
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	943
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	944 if (invert)
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	945 {
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	946 Orthanc::ImageProcessing::Invert(*image);
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	947 }
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	948 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	949 else
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	950 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	951 throw OrthancException(ErrorCode_NotImplemented);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	952 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	953 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	954
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	955
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	956 void DicomImageDecoder::ExtractPamImage(std::string& result,
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	957 std::auto_ptr<ImageAccessor>& image,
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	958 ImageExtractionMode mode,
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	959 bool invert)
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	960 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	961 ApplyExtractionMode(image, mode, invert);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	962
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	963 PamWriter writer;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	964 writer.WriteToMemory(result, *image);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	965 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2488 diff changeset	966
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	967 #if ORTHANC_ENABLE_PNG == 1
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	968 void DicomImageDecoder::ExtractPngImage(std::string& result,
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	969 std::auto_ptr<ImageAccessor>& image,
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	970 ImageExtractionMode mode,
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	971 bool invert)
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	972 {
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	973 ApplyExtractionMode(image, mode, invert);
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	974
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	975 PngWriter writer;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	976 writer.WriteToMemory(result, *image);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	977 }
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	978 #endif
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	979
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	980
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	981 #if ORTHANC_ENABLE_JPEG == 1
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	982 void DicomImageDecoder::ExtractJpegImage(std::string& result,
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	983 std::auto_ptr<ImageAccessor>& image,
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	984 ImageExtractionMode mode,
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	985 bool invert,
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	986 uint8_t quality)
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	987 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	988 if (mode != ImageExtractionMode_UInt8 &&
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	989 mode != ImageExtractionMode_Preview)
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	990 {
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	991 throw OrthancException(ErrorCode_ParameterOutOfRange);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	992 }
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	993
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	994 ApplyExtractionMode(image, mode, invert);
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	995
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	996 JpegWriter writer;
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	997 writer.SetQuality(quality);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	998 writer.WriteToMemory(result, *image);
8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	999 }
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	1000 #endif
845 48016722c770 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1001 }

Mercurial > hg > orthanc

annotate Core/DicomParsing/Internals/DicomImageDecoder.cpp @ 3508:70524b4acc72