# HG changeset patch # User Sebastien Jodogne # Date 1401976687 -7200 # Node ID 48016722c7708495aeaed252a9b2faa274209f1b # Parent 502c49adb5ad6882f314acc575a8b159240e6b82 refactoring diff -r 502c49adb5ad -r 48016722c770 CMakeLists.txt --- a/CMakeLists.txt Thu Jun 05 14:08:23 2014 +0200 +++ b/CMakeLists.txt Thu Jun 05 15:58:07 2014 +0200 @@ -127,6 +127,7 @@ OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp + OrthancServer/Internals/DicomImageDecoder.cpp OrthancServer/OrthancInitialization.cpp OrthancServer/OrthancPeerParameters.cpp OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp diff -r 502c49adb5ad -r 48016722c770 OrthancServer/Internals/DicomImageDecoder.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancServer/Internals/DicomImageDecoder.cpp Thu Jun 05 15:58:07 2014 +0200 @@ -0,0 +1,172 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, + * Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#include "../PrecompiledHeadersServer.h" +#include "DicomImageDecoder.h" + +#include "../../Core/OrthancException.h" +#include "../ToDcmtkBridge.h" + +#include +#include +#include +#include + +#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 +#endif + + +namespace Orthanc +{ + void DicomImageDecoder::SetupImageBuffer(ImageBuffer& target, + DcmDataset& dataset) + { + OFString value; + + if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_COLUMNS), value).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + unsigned int width = boost::lexical_cast(value.c_str()); + + if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_ROWS), value).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + unsigned int height = boost::lexical_cast(value.c_str()); + + if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_BITS_STORED), value).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + unsigned int bitsStored = boost::lexical_cast(value.c_str()); + + if (!dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_REPRESENTATION), value).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + bool isSigned = (boost::lexical_cast(value.c_str()) != 0); + + unsigned int samplesPerPixel = 1; // By default + if (dataset.findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_SAMPLES_PER_PIXEL), value).good()) + { + samplesPerPixel = boost::lexical_cast(value.c_str()); + } + + target.SetHeight(height); + target.SetWidth(width); + + if (bitsStored == 8 && samplesPerPixel == 1 && !isSigned) + { + target.SetFormat(PixelFormat_Grayscale8); + } + else if (bitsStored == 8 && samplesPerPixel == 3 && !isSigned) + { + target.SetFormat(PixelFormat_RGB24); + } + else if (bitsStored == 16 && samplesPerPixel == 1 && !isSigned) + { + target.SetFormat(PixelFormat_Grayscale16); + } + else if (bitsStored == 16 && samplesPerPixel == 1 && isSigned) + { + target.SetFormat(PixelFormat_SignedGrayscale16); + } + else + { + throw OrthancException(ErrorCode_NotImplemented); + } + } + + + bool DicomImageDecoder::IsJpegLossless(const DcmDataset& dataset) + { + return (dataset.getOriginalXfer() == EXS_JPEGLSLossless || + dataset.getOriginalXfer() == EXS_JPEGLSLossy); + } + + +#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 + void DicomImageDecoder::DecodeJpegLossless(ImageBuffer& target, + DcmDataset& dataset) + { + if (!IsJpegLossless(dataset)) + { + throw OrthancException(ErrorCode_BadParameterType); + } + + DcmElement *element = NULL; + if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), element).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + DcmPixelData& pixelData = dynamic_cast(*element); + DcmPixelSequence* pixelSequence = NULL; + if (!pixelData.getEncapsulatedRepresentation + (dataset.getOriginalXfer(), NULL, pixelSequence).good()) + { + throw OrthancException(ErrorCode_BadFileFormat); + } + + SetupImageBuffer(target, dataset); + + ImageAccessor accessor(target.GetAccessor()); + + /** + * The "DJLSLosslessDecoder" and "DJLSNearLosslessDecoder" in DCMTK + * are exactly the same, except for the "supportedTransferSyntax()" + * virtual function. + * http://support.dcmtk.org/docs/classDJLSDecoderBase.html + **/ + + DJLSLosslessDecoder decoder; DJLSCodecParameter parameters; + //DJLSNearLosslessDecoder decoder; DJLSCodecParameter parameters; + + Uint32 startFragment = 0; // Default + OFString decompressedColorModel; // Out + DJ_RPLossless representationParameter; + OFCondition c = decoder.decodeFrame(&representationParameter, pixelSequence, ¶meters, + &dataset, 0, startFragment, accessor.GetBuffer(), + accessor.GetSize(), decompressedColorModel); + + if (!c.good()) + { + throw OrthancException(ErrorCode_InternalError); + } + } +#endif +} diff -r 502c49adb5ad -r 48016722c770 OrthancServer/Internals/DicomImageDecoder.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancServer/Internals/DicomImageDecoder.h Thu Jun 05 15:58:07 2014 +0200 @@ -0,0 +1,55 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, + * Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#pragma once + +#include + +#include "../../Core/ImageFormats/ImageBuffer.h" + +namespace Orthanc +{ + class DicomImageDecoder + { + public: + static void SetupImageBuffer(ImageBuffer& target, + DcmDataset& dataset); + + static bool IsJpegLossless(const DcmDataset& dataset); + +#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 + static void DecodeJpegLossless(ImageBuffer& target, + DcmDataset& dataset); +#endif + + }; +} diff -r 502c49adb5ad -r 48016722c770 UnitTestsSources/JpegLossless.cpp --- a/UnitTestsSources/JpegLossless.cpp Thu Jun 05 14:08:23 2014 +0200 +++ b/UnitTestsSources/JpegLossless.cpp Thu Jun 05 15:58:07 2014 +0200 @@ -33,28 +33,19 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" +#include "../OrthancServer/Internals/DicomImageDecoder.h" + #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 -#include -#include #include -#include -#include -#include -#include -#include - #include "../OrthancServer/ParsedDicomFile.h" -#include "../OrthancServer/FromDcmtkBridge.h" -#include "../OrthancServer/ToDcmtkBridge.h" #include "../Core/OrthancException.h" #include "../Core/ImageFormats/ImageBuffer.h" #include "../Core/ImageFormats/PngWriter.h" -#include +using namespace Orthanc; -using namespace Orthanc; TEST(JpegLossless, Basic) { @@ -93,110 +84,27 @@ //if (fileformat.loadFile("IM-0001-1001-0001.dcm").good()) if (fileformat.loadFile("tata.dcm").good()) { - DcmDataset *dataset = fileformat.getDataset(); - - // - - DcmTag k(DICOM_TAG_PIXEL_DATA.GetGroup(), - DICOM_TAG_PIXEL_DATA.GetElement()); - - DcmElement *element = NULL; - if (dataset->findAndGetElement(k, element).good()) - { - DcmPixelData& pixelData = dynamic_cast(*element); - DcmPixelSequence* pixelSequence = NULL; - if (pixelData.getEncapsulatedRepresentation - (dataset->getOriginalXfer(), NULL, pixelSequence).good()) - { - OFString value; - - if (!dataset->findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_COLUMNS), value).good()) - { - throw OrthancException(ErrorCode_BadFileFormat); - } - - unsigned int width = boost::lexical_cast(value.c_str()); + DcmDataset& dataset = *fileformat.getDataset(); - if (!dataset->findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_ROWS), value).good()) - { - throw OrthancException(ErrorCode_BadFileFormat); - } - - unsigned int height = boost::lexical_cast(value.c_str()); - - if (!dataset->findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_BITS_STORED), value).good()) - { - throw OrthancException(ErrorCode_BadFileFormat); - } + ASSERT_TRUE(DicomImageDecoder::IsJpegLossless(dataset)); - unsigned int bitsStored = boost::lexical_cast(value.c_str()); - - if (!dataset->findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_REPRESENTATION), value).good()) - { - throw OrthancException(ErrorCode_BadFileFormat); - } - - bool isSigned = (boost::lexical_cast(value.c_str()) != 0); - - unsigned int samplesPerPixel = 1; // By default - if (dataset->findAndGetOFString(ToDcmtkBridge::Convert(DICOM_TAG_SAMPLES_PER_PIXEL), value).good()) - { - samplesPerPixel = boost::lexical_cast(value.c_str()); - } + ImageBuffer image; + DicomImageDecoder::DecodeJpegLossless(image, dataset); - ImageBuffer buffer; - buffer.SetHeight(height); - buffer.SetWidth(width); - - if (bitsStored == 8 && samplesPerPixel == 1 && !isSigned) - { - buffer.SetFormat(PixelFormat_Grayscale8); - } - else if (bitsStored == 8 && samplesPerPixel == 3 && !isSigned) - { - buffer.SetFormat(PixelFormat_RGB24); - } - else if (bitsStored == 16 && samplesPerPixel == 1 && !isSigned) - { - buffer.SetFormat(PixelFormat_Grayscale16); - } - else if (bitsStored == 16 && samplesPerPixel == 1 && isSigned) - { - buffer.SetFormat(PixelFormat_SignedGrayscale16); - } - else - { - throw OrthancException(ErrorCode_NotImplemented); - } + ImageAccessor accessor(image.GetAccessor()); - ImageAccessor accessor(buffer.GetAccessor()); - - // http://support.dcmtk.org/docs/classDJLSLosslessDecoder.html - DJLSLosslessDecoder bb; DJLSCodecParameter cp; - //DJLSNearLosslessDecoder bb; DJLSCodecParameter cp; - - Uint32 startFragment = 0; // Default - OFString decompressedColorModel; // Out - DJ_RPLossless rp; - OFCondition c = bb.decodeFrame(&rp, pixelSequence, &cp, dataset, 0, startFragment, - accessor.GetBuffer(), accessor.GetSize(), decompressedColorModel); - - - - for (unsigned int y = 0; y < accessor.GetHeight(); y++) - { - int16_t *p = reinterpret_cast(accessor.GetRow(y)); - for (unsigned int x = 0; x < accessor.GetWidth(); x++, p ++) - { - if (*p < 0) - *p = 0; - } - } - - PngWriter w; - w.WriteToFile("tata.png", accessor); + for (unsigned int y = 0; y < accessor.GetHeight(); y++) + { + int16_t *p = reinterpret_cast(accessor.GetRow(y)); + for (unsigned int x = 0; x < accessor.GetWidth(); x++, p ++) + { + if (*p < 0) + *p = 0; } } + + PngWriter w; + w.WriteToFile("tata.png", accessor); } #endif