Mercurial > hg > orthanc

comparison OrthancServer/Internals/DicomImageDecoder.cpp @ 2136:dd609a99d39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformization of the macro naming
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:08:05 +0100
parents bb199bccdc45
children a3a65de1840f
comparison
equal deleted inserted replaced
2135:cadfe0a2a393 2136:dd609a99d39a
92 92
93 #include <dcmtk/dcmdata/dcfilefo.h> 93 #include <dcmtk/dcmdata/dcfilefo.h>
94 #include <dcmtk/dcmdata/dcrleccd.h> 94 #include <dcmtk/dcmdata/dcrleccd.h>
95 #include <dcmtk/dcmdata/dcrlecp.h> 95 #include <dcmtk/dcmdata/dcrlecp.h>
96 96
97 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 97 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
98 # include <dcmtk/dcmjpls/djcodecd.h> 98 # include <dcmtk/dcmjpls/djcodecd.h>
99 # include <dcmtk/dcmjpls/djcparam.h> 99 # include <dcmtk/dcmjpls/djcparam.h>
100 # include <dcmtk/dcmjpeg/djrplol.h> 100 # include <dcmtk/dcmjpeg/djrplol.h>
101 #endif 101 #endif
102 102
103 #if ORTHANC_JPEG_ENABLED == 1 103 #if ORTHANC_ENABLE_JPEG == 1
104 # include <dcmtk/dcmjpeg/djcodecd.h> 104 # include <dcmtk/dcmjpeg/djcodecd.h>
105 # include <dcmtk/dcmjpeg/djcparam.h> 105 # include <dcmtk/dcmjpeg/djcparam.h>
106 # include <dcmtk/dcmjpeg/djdecbas.h> 106 # include <dcmtk/dcmjpeg/djdecbas.h>
107 # include <dcmtk/dcmjpeg/djdecext.h> 107 # include <dcmtk/dcmjpeg/djdecext.h>
108 # include <dcmtk/dcmjpeg/djdeclol.h> 108 # include <dcmtk/dcmjpeg/djdeclol.h>
515 { 515 {
516 return DecodeUncompressedImage(dataset, frame); 516 return DecodeUncompressedImage(dataset, frame);
517 } 517 }
518 518
519 519
520 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 520 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
521 /** 521 /**
522 * Deal with JPEG-LS images. 522 * Deal with JPEG-LS images.
523 **/ 523 **/
524 524
525 if (syntax == EXS_JPEGLSLossless || 525 if (syntax == EXS_JPEGLSLossless ||
547 return ApplyCodec(*decoder, parameters, dataset, frame); 547 return ApplyCodec(*decoder, parameters, dataset, frame);
548 } 548 }
549 #endif 549 #endif
550 550
551 551
552 #if ORTHANC_JPEG_ENABLED == 1 552 #if ORTHANC_ENABLE_JPEG == 1
553 /** 553 /**
554 * Deal with JPEG images. 554 * Deal with JPEG images.
555 **/ 555 **/
556 556
557 if (syntax == EXS_JPEGProcess1 || // DJDecoderBaseline 557 if (syntax == EXS_JPEGProcess1 || // DJDecoderBaseline