annotate UnitTestsSources/JpegLossless.cpp @ 857:f53358c70c05 jpeg

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Jun 2014 15:01:19 +0200
parents 9ee2e7a5efaf
children ea246626b96c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
839
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Belgium
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "PrecompiledHeadersUnitTests.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "gtest/gtest.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
845
48016722c770 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
36 #include "../OrthancServer/Internals/DicomImageDecoder.h"
48016722c770 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
37
842
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 840
diff changeset
38 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 840
diff changeset
39
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
40 #include <dcmtk/dcmdata/dcfilefo.h>
840
256e1530eb0f fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 839
diff changeset
41
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
42 #include "../OrthancServer/ParsedDicomFile.h"
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
43 #include "../Core/OrthancException.h"
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
44 #include "../Core/ImageFormats/ImageBuffer.h"
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
45 #include "../Core/ImageFormats/PngWriter.h"
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
46
845
48016722c770 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
47 using namespace Orthanc;
839
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 TEST(JpegLossless, Basic)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 {
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
52 #if 0
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
53 // Fallback
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
54
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
55 std::string s;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
56 Toolbox::ReadFile(s, "IM-0001-1001-0001.dcm");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
57
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
58 ParsedDicomFile parsed(s);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
59 DcmFileFormat& dicom = *reinterpret_cast<DcmFileFormat*>(parsed.GetDcmtkObject());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
60
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
61 DcmDataset* dataset = dicom.getDataset();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
62
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
63 dataset->chooseRepresentation(EXS_LittleEndianExplicit, NULL);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
64
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
65 if (dataset->canWriteXfer(EXS_LittleEndianExplicit))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
66 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
67 printf("ICI\n");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
68
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
69 parsed.SaveToFile("tutu.dcm");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
70
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
71 // decompress data set if compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
72 dataset->chooseRepresentation(EXS_LittleEndianExplicit, NULL);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
74 DcmXfer original_xfer(dataset->getOriginalXfer());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
75 std::cout << original_xfer.getXferName() << std::endl;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
76
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
77 FromDcmtkBridge::ExtractPngImage(s, *dataset, 1, ImageExtractionMode_Preview);
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
78 //fileformat.saveFile("test_decompressed.dcm", EXS_LittleEndianExplicit);
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
79 }
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
80 #else
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
81 DcmFileFormat fileformat;
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 850
diff changeset
82 //ASSERT_TRUE(fileformat.loadFile("IM-0001-1001-0001.dcm").good());
850
9ee2e7a5efaf support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 848
diff changeset
83 //ASSERT_TRUE(fileformat.loadFile("tata.dcm").good());
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 850
diff changeset
84 ASSERT_TRUE(fileformat.loadFile("RG2_JPLY").good());
850
9ee2e7a5efaf support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 848
diff changeset
85
848
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
86 DcmDataset& dataset = *fileformat.getDataset();
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
87
850
9ee2e7a5efaf support of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 848
diff changeset
88 //ASSERT_TRUE(DicomImageDecoder::IsJpegLossless(dataset));
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
89
848
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
90 ImageBuffer image;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
91 //DicomImageDecoder::DecodeJpegLossless(image, dataset, 0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
92 DicomImageDecoder::Decode(image, dataset, 0);
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 843
diff changeset
93
848
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
94 ImageAccessor accessor(image.GetAccessor());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
95
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
96 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
97 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
98 int16_t *p = reinterpret_cast<int16_t*>(accessor.GetRow(y));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
99 for (unsigned int x = 0; x < accessor.GetWidth(); x++, p ++)
845
48016722c770 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
100 {
848
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
101 if (*p < 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
102 *p = 0;
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
103 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
104 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
105
848
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
106 PngWriter w;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 847
diff changeset
107 w.WriteToFile("tata.png", accessor);
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 842
diff changeset
108 #endif
839
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 }
842
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 840
diff changeset
110
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 840
diff changeset
111
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 840
diff changeset
112 #endif