# HG changeset patch # User Sebastien Jodogne # Date 1588689157 -7200 # Node ID 25c122277f53a9d7fe820ae8ab58f55bd63c2ad3 # Parent b808958dff2a50ce241ea9790b5e67cafbce62a5 transcoding to JPEGProcess14SV1 diff -r b808958dff2a -r 25c122277f53 UnitTestsSources/FromDcmtkTests.cpp --- a/UnitTestsSources/FromDcmtkTests.cpp Tue May 05 16:03:46 2020 +0200 +++ b/UnitTestsSources/FromDcmtkTests.cpp Tue May 05 16:32:37 2020 +0200 @@ -1926,9 +1926,9 @@ #include "../Core/DicomNetworking/DicomStoreUserConnection.h" -#include // for DJ_RPLossy -//#include // for DJ_RPLossless -#include // for DJLSRepresentationParameter +#include // for DJ_RPLossy +#include // for DJ_RPLossless +#include // for DJLSRepresentationParameter #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) @@ -2243,6 +2243,7 @@ allowNewSopInstanceUid && bitsStored == 8) { + // Check out "dcmjpeg/apps/dcmcjpeg.cc" DJ_RPLossy parameters(lossyQuality_); if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess1, ¶meters)) @@ -2258,6 +2259,7 @@ allowNewSopInstanceUid && bitsStored <= 12) { + // Check out "dcmjpeg/apps/dcmcjpeg.cc" DJ_RPLossy parameters(lossyQuality_); if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess2_4, ¶meters)) { @@ -2267,6 +2269,20 @@ } #endif +#if ORTHANC_ENABLE_DCMTK_JPEG == 1 + if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess14SV1) != allowedSyntaxes.end()) + { + // Check out "dcmjpeg/apps/dcmcjpeg.cc" + DJ_RPLossless parameters(6 /* opt_selection_value */, + 0 /* opt_point_transform */); + if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess14SV1, ¶meters)) + { + CheckSopInstanceUid(dicom, sourceSopInstanceUid, true); + return true; + } + } +#endif + #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGLSLossless) != allowedSyntaxes.end()) {