Mercurial > hg > orthanc
annotate OrthancFramework/UnitTestsSources/ImageTests.cpp @ 5368:91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 12 Aug 2023 13:17:17 +0200 |
| parents | 0ea402b4d901 |
| children | 48b8dae6dc77 |
| rev | line source |
|---|---|
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
1 /** |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
967
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
5185
0ea402b4d901
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5054
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
0ea402b4d901
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5054
diff
changeset
|
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
7 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
8 * This program is free software: you can redistribute it and/or |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
9 * modify it under the terms of the GNU Lesser General Public License |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
10 * as published by the Free Software Foundation, either version 3 of |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
11 * the License, or (at your option) any later version. |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
12 * |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
13 * This program is distributed in the hope that it will be useful, but |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
14 * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
16 * Lesser General Public License for more details. |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
17 * |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
18 * You should have received a copy of the GNU Lesser General Public |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
19 * License along with this program. If not, see |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4063
diff
changeset
|
20 * <http://www.gnu.org/licenses/>. |
|
827
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
21 **/ |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
22 |
|
3d6f9b7d0add
precompiled headers in unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
803
diff
changeset
|
23 |
|
4046
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
24 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1 |
|
4063
e00f3d089991
shared library of orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4062
diff
changeset
|
25 // Must be the first to be sure to use the Orthanc framework shared library |
|
4046
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
26 # include <OrthancFramework.h> |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
27 #endif |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
28 |
| 4062 | 29 #include <gtest/gtest.h> |
| 368 | 30 |
|
4046
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
31 #include "../Sources/Images/Font.h" |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
32 #include "../Sources/Images/Image.h" |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
33 #include "../Sources/Images/ImageProcessing.h" |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
34 #include "../Sources/Images/JpegReader.h" |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
35 #include "../Sources/Images/JpegWriter.h" |
|
5368
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
36 #include "../Sources/Images/PamReader.h" |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
37 #include "../Sources/Images/PamWriter.h" |
|
4046
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
38 #include "../Sources/Images/PngReader.h" |
|
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
39 #include "../Sources/Images/PngWriter.h" |
|
5368
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
40 #include "../Sources/OrthancException.h" |
|
4046
7ff1e6c80627
moving ImageTests.cpp to framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
41 #include "../Sources/Toolbox.h" |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
42 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
43 #if ORTHANC_SANDBOXED != 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
44 # include "../Sources/SystemToolbox.h" |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
45 # include "../Sources/TemporaryFile.h" |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
46 #endif |
|
1610
2dff2bdffdb8
font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
47 |
|
2dff2bdffdb8
font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
48 #include <stdint.h> |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
49 |
| 368 | 50 |
| 51 TEST(PngWriter, ColorPattern) | |
| 52 { | |
| 53 Orthanc::PngWriter w; | |
|
1654
3727a09e7b53
fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
54 unsigned int width = 17; |
|
3727a09e7b53
fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
55 unsigned int height = 61; |
|
3727a09e7b53
fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
56 unsigned int pitch = width * 3; |
| 368 | 57 |
| 58 std::vector<uint8_t> image(height * pitch); | |
|
1654
3727a09e7b53
fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
59 for (unsigned int y = 0; y < height; y++) |
| 368 | 60 { |
| 61 uint8_t *p = &image[0] + y * pitch; | |
|
1654
3727a09e7b53
fix some icc warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1612
diff
changeset
|
62 for (unsigned int x = 0; x < width; x++, p += 3) |
| 368 | 63 { |
| 64 p[0] = (y % 3 == 0) ? 255 : 0; | |
| 65 p[1] = (y % 3 == 1) ? 255 : 0; | |
| 66 p[2] = (y % 3 == 2) ? 255 : 0; | |
| 67 } | |
| 68 } | |
| 69 | |
| 1916 | 70 Orthanc::ImageAccessor accessor; |
| 71 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]); | |
| 72 | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
73 std::string f; |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
74 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
75 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
76 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
77 #else |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
78 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.png", accessor); |
| 2140 | 79 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png"); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
80 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
81 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
82 std::string md5; |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
83 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
84 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5); |
| 368 | 85 } |
| 86 | |
|
5054
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
87 TEST(PngWriter, Color16Pattern) |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
88 { |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
89 Orthanc::PngWriter w; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
90 unsigned int width = 17; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
91 unsigned int height = 61; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
92 unsigned int pitch = width * 8; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
93 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
94 std::vector<uint8_t> image(height * pitch); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
95 for (unsigned int y = 0; y < height; y++) |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
96 { |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
97 uint8_t *p = &image[0] + y * pitch; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
98 for (unsigned int x = 0; x < width; x++, p += 8) |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
99 { |
|
5368
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
100 switch (Orthanc::Toolbox::DetectEndianness()) |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
101 { |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
102 case Orthanc::Endianness_Little: |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
103 p[0] = (y % 8 == 0) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
104 p[1] = (y % 8 == 1) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
105 p[2] = (y % 8 == 2) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
106 p[3] = (y % 8 == 3) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
107 p[4] = (y % 8 == 4) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
108 p[5] = (y % 8 == 5) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
109 p[6] = (y % 8 == 6) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
110 p[7] = (y % 8 == 7) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
111 break; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
112 |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
113 case Orthanc::Endianness_Big: |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
114 p[0] = (y % 8 == 1) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
115 p[1] = (y % 8 == 0) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
116 p[2] = (y % 8 == 3) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
117 p[3] = (y % 8 == 2) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
118 p[4] = (y % 8 == 5) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
119 p[5] = (y % 8 == 4) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
120 p[6] = (y % 8 == 7) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
121 p[7] = (y % 8 == 6) ? 255 : 0; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
122 break; |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
123 |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
124 default: |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
125 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
91b3154bd4e1
Fix unit test PngWriter.Color16Pattern on big-endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
126 } |
|
5054
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
127 } |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
128 } |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
129 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
130 Orthanc::ImageAccessor accessor; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
131 accessor.AssignReadOnly(Orthanc::PixelFormat_RGBA64, width, height, pitch, &image[0]); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
132 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
133 std::string f; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
134 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
135 #if ORTHANC_SANDBOXED == 1 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
136 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
137 #else |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
138 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Color16Pattern.png", accessor); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
139 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Color16Pattern.png"); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
140 #endif |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
141 |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
142 std::string md5; |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
143 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
144 ASSERT_EQ("1cca552b6bd152b6fdab35c4a9f02c2a", md5); |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
145 } |
|
255b02c68908
Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny)
Alain Mazy <am@osimis.io>
parents:
4870
diff
changeset
|
146 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
147 |
| 368 | 148 TEST(PngWriter, Gray8Pattern) |
| 149 { | |
| 150 Orthanc::PngWriter w; | |
| 151 int width = 17; | |
| 152 int height = 256; | |
| 153 int pitch = width; | |
| 154 | |
| 155 std::vector<uint8_t> image(height * pitch); | |
| 156 for (int y = 0; y < height; y++) | |
| 157 { | |
| 158 uint8_t *p = &image[0] + y * pitch; | |
| 159 for (int x = 0; x < width; x++, p++) | |
| 160 { | |
| 161 *p = y; | |
| 162 } | |
| 163 } | |
| 164 | |
| 1916 | 165 Orthanc::ImageAccessor accessor; |
| 166 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]); | |
| 167 | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
168 std::string f; |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
169 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
170 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
171 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
172 #else |
|
4311
cb9aef006229
turning IImageWriter into a pure interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4211
diff
changeset
|
173 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.png", accessor); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
174 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png"); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
175 #endif |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
176 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
177 std::string md5; |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
178 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
179 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5); |
| 368 | 180 } |
| 181 | |
| 182 TEST(PngWriter, Gray16Pattern) | |
| 183 { | |
| 184 Orthanc::PngWriter w; | |
| 185 int width = 256; | |
| 186 int height = 256; | |
|
369
4632a044746e
simplification of the code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
187 int pitch = width * 2 + 16; |
| 368 | 188 |
| 189 std::vector<uint8_t> image(height * pitch); | |
|
369
4632a044746e
simplification of the code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
190 |
| 368 | 191 int v = 0; |
| 192 for (int y = 0; y < height; y++) | |
| 193 { | |
| 194 uint16_t *p = reinterpret_cast<uint16_t*>(&image[0] + y * pitch); | |
| 195 for (int x = 0; x < width; x++, p++, v++) | |
| 196 { | |
| 197 *p = v; | |
| 198 } | |
| 199 } | |
| 200 | |
| 1916 | 201 Orthanc::ImageAccessor accessor; |
| 202 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); | |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
203 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
204 std::string f; |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
205 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
206 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
207 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
208 #else |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
209 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.png", accessor); |
| 2140 | 210 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png"); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
211 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
212 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
213 std::string md5; |
|
639
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
214 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
51892be15618
fix for big endian architectures
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
632
diff
changeset
|
215 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5); |
| 368 | 216 } |
| 455 | 217 |
| 218 TEST(PngWriter, EndToEnd) | |
| 219 { | |
| 220 Orthanc::PngWriter w; | |
| 1492 | 221 unsigned int width = 256; |
| 222 unsigned int height = 256; | |
| 223 unsigned int pitch = width * 2 + 16; | |
| 455 | 224 |
| 225 std::vector<uint8_t> image(height * pitch); | |
| 226 | |
| 227 int v = 0; | |
| 1492 | 228 for (unsigned int y = 0; y < height; y++) |
| 455 | 229 { |
| 230 uint16_t *p = reinterpret_cast<uint16_t*>(&image[0] + y * pitch); | |
| 1492 | 231 for (unsigned int x = 0; x < width; x++, p++, v++) |
| 455 | 232 { |
| 233 *p = v; | |
| 234 } | |
| 235 } | |
| 236 | |
| 1916 | 237 Orthanc::ImageAccessor accessor; |
| 238 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); | |
| 239 | |
| 455 | 240 std::string s; |
|
4311
cb9aef006229
turning IImageWriter into a pure interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4211
diff
changeset
|
241 Orthanc::IImageWriter::WriteToMemory(w, s, accessor); |
| 455 | 242 |
| 709 | 243 { |
| 244 Orthanc::PngReader r; | |
| 245 r.ReadFromMemory(s); | |
| 455 | 246 |
| 710 | 247 ASSERT_EQ(r.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
| 709 | 248 ASSERT_EQ(r.GetWidth(), width); |
| 249 ASSERT_EQ(r.GetHeight(), height); | |
| 455 | 250 |
| 709 | 251 v = 0; |
| 1492 | 252 for (unsigned int y = 0; y < height; y++) |
| 709 | 253 { |
|
797
37adac56017a
ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
254 const uint16_t *p = reinterpret_cast<const uint16_t*>((const uint8_t*) r.GetConstBuffer() + y * r.GetPitch()); |
|
37adac56017a
ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
255 ASSERT_EQ(p, r.GetConstRow(y)); |
| 1492 | 256 for (unsigned int x = 0; x < width; x++, p++, v++) |
| 709 | 257 { |
| 258 ASSERT_EQ(*p, v); | |
| 259 } | |
| 260 } | |
| 261 } | |
| 262 | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
263 #if ORTHANC_SANDBOXED != 1 |
| 455 | 264 { |
| 2140 | 265 Orthanc::TemporaryFile tmp; |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
266 tmp.Write(s); |
| 709 | 267 |
| 268 Orthanc::PngReader r2; | |
| 269 r2.ReadFromFile(tmp.GetPath()); | |
| 270 | |
| 710 | 271 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
| 709 | 272 ASSERT_EQ(r2.GetWidth(), width); |
| 273 ASSERT_EQ(r2.GetHeight(), height); | |
| 710 | 274 |
| 275 v = 0; | |
| 1492 | 276 for (unsigned int y = 0; y < height; y++) |
| 455 | 277 { |
|
797
37adac56017a
ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
278 const uint16_t *p = reinterpret_cast<const uint16_t*>((const uint8_t*) r2.GetConstBuffer() + y * r2.GetPitch()); |
|
37adac56017a
ImageAccessor abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
711
diff
changeset
|
279 ASSERT_EQ(p, r2.GetConstRow(y)); |
| 1492 | 280 for (unsigned int x = 0; x < width; x++, p++, v++) |
| 709 | 281 { |
| 282 ASSERT_EQ(*p, v); | |
| 283 } | |
| 455 | 284 } |
| 285 } | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
286 #endif |
| 455 | 287 } |
| 1602 | 288 |
| 289 | |
| 290 | |
| 291 | |
| 292 TEST(JpegWriter, Basic) | |
| 293 { | |
| 1604 | 294 std::string s; |
| 295 | |
| 1602 | 296 { |
| 2107 | 297 Orthanc::Image img(Orthanc::PixelFormat_Grayscale8, 16, 16, false); |
| 1604 | 298 for (unsigned int y = 0, value = 0; y < img.GetHeight(); y++) |
| 1602 | 299 { |
|
1608
adc6a5704cdb
OrthancPluginConvertPixelFormat
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1604
diff
changeset
|
300 uint8_t* p = reinterpret_cast<uint8_t*>(img.GetRow(y)); |
| 1604 | 301 for (unsigned int x = 0; x < img.GetWidth(); x++, p++) |
| 302 { | |
| 303 *p = value++; | |
| 304 } | |
| 305 } | |
| 306 | |
| 307 Orthanc::JpegWriter w; | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
308 Orthanc::IImageWriter::WriteToMemory(w, s, img); |
| 1604 | 309 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
310 #if ORTHANC_SANDBOXED != 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
311 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/hello.jpg", img); |
| 2140 | 312 Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg"); |
| 1604 | 313 |
| 314 std::string t; | |
| 2140 | 315 Orthanc::SystemToolbox::ReadFile(t, "UnitTestsResults/hello.jpg"); |
| 1604 | 316 ASSERT_EQ(s.size(), t.size()); |
| 317 ASSERT_EQ(0, memcmp(s.c_str(), t.c_str(), s.size())); | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
318 #endif |
| 1604 | 319 } |
| 320 | |
| 321 { | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
322 Orthanc::JpegReader r1; |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
323 r1.ReadFromMemory(s); |
| 1970 | 324 ASSERT_EQ(16u, r1.GetWidth()); |
| 325 ASSERT_EQ(16u, r1.GetHeight()); | |
| 1604 | 326 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
327 #if ORTHANC_SANDBOXED != 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
328 Orthanc::JpegReader r2; |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
329 r2.ReadFromFile("UnitTestsResults/hello.jpg"); |
| 1970 | 330 ASSERT_EQ(16u, r2.GetWidth()); |
| 331 ASSERT_EQ(16u, r2.GetHeight()); | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
332 #endif |
| 1604 | 333 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
334 unsigned int value = 0; |
| 1604 | 335 for (unsigned int y = 0; y < r1.GetHeight(); y++) |
| 336 { | |
| 337 const uint8_t* p1 = reinterpret_cast<const uint8_t*>(r1.GetConstRow(y)); | |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
338 #if ORTHANC_SANDBOXED != 1 |
| 1604 | 339 const uint8_t* p2 = reinterpret_cast<const uint8_t*>(r2.GetConstRow(y)); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
340 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
341 for (unsigned int x = 0; x < r1.GetWidth(); x++, value++) |
| 1604 | 342 { |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
343 ASSERT_TRUE(*p1 == value || |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
344 *p1 == value - 1 || |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
345 *p1 == value + 1); // Be tolerant to differences of +-1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
346 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
347 #if ORTHANC_SANDBOXED != 1 |
| 1604 | 348 ASSERT_EQ(*p1, *p2); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
349 p2++; |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
350 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
351 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
352 p1++; |
| 1604 | 353 } |
| 1602 | 354 } |
| 355 } | |
| 356 } | |
|
1610
2dff2bdffdb8
font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
357 |
|
2dff2bdffdb8
font support within Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
358 |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
359 TEST(PamWriter, ColorPattern) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
360 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
361 Orthanc::PamWriter w; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
362 unsigned int width = 17; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
363 unsigned int height = 61; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
364 unsigned int pitch = width * 3; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
365 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
366 std::vector<uint8_t> image(height * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
367 for (unsigned int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
368 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
369 uint8_t *p = &image[0] + y * pitch; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
370 for (unsigned int x = 0; x < width; x++, p += 3) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
371 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
372 p[0] = (y % 3 == 0) ? 255 : 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
373 p[1] = (y % 3 == 1) ? 255 : 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
374 p[2] = (y % 3 == 2) ? 255 : 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
375 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
376 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
377 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
378 Orthanc::ImageAccessor accessor; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
379 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
380 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
381 std::string f; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
382 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
383 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
384 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
385 #else |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
386 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.pam", accessor); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
387 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.pam"); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
388 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
389 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
390 std::string md5; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
391 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
392 ASSERT_EQ("81a3441754e88969ebbe53e69891e841", md5); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
393 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
394 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
395 TEST(PamWriter, Gray8Pattern) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
396 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
397 Orthanc::PamWriter w; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
398 int width = 17; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
399 int height = 256; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
400 int pitch = width; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
401 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
402 std::vector<uint8_t> image(height * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
403 for (int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
404 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
405 uint8_t *p = &image[0] + y * pitch; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
406 for (int x = 0; x < width; x++, p++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
407 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
408 *p = y; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
409 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
410 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
411 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
412 Orthanc::ImageAccessor accessor; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
413 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
414 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
415 std::string f; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
416 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
417 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
418 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
419 #else |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
420 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.pam", accessor); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
421 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.pam"); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
422 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
423 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
424 std::string md5; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
425 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
426 ASSERT_EQ("7873c408d26a9d11dd1c1de5e69cc0a3", md5); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
427 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
428 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
429 TEST(PamWriter, Gray16Pattern) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
430 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
431 Orthanc::PamWriter w; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
432 int width = 256; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
433 int height = 256; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
434 int pitch = width * 2 + 16; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
435 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
436 std::vector<uint8_t> image(height * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
437 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
438 int v = 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
439 for (int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
440 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
441 uint16_t *p = reinterpret_cast<uint16_t*>(&image[0] + y * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
442 for (int x = 0; x < width; x++, p++, v++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
443 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
444 *p = v; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
445 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
446 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
447 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
448 Orthanc::ImageAccessor accessor; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
449 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
450 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
451 std::string f; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
452 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
453 #if ORTHANC_SANDBOXED == 1 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
454 Orthanc::IImageWriter::WriteToMemory(w, f, accessor); |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
455 #else |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
456 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.pam", accessor); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
457 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.pam"); |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
458 #endif |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
459 |
|
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
460 std::string md5; |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
461 Orthanc::Toolbox::ComputeMD5(md5, f); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
462 ASSERT_EQ("b268772bf28f3b2b8520ff21c5e3dcb6", md5); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
463 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
464 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
465 TEST(PamWriter, EndToEnd) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
466 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
467 Orthanc::PamWriter w; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
468 unsigned int width = 256; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
469 unsigned int height = 256; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
470 unsigned int pitch = width * 2 + 16; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
471 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
472 std::vector<uint8_t> image(height * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
473 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
474 int v = 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
475 for (unsigned int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
476 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
477 uint16_t *p = reinterpret_cast<uint16_t*>(&image[0] + y * pitch); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
478 for (unsigned int x = 0; x < width; x++, p++, v++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
479 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
480 *p = v; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
481 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
482 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
483 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
484 Orthanc::ImageAccessor accessor; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
485 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
486 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
487 std::string s; |
|
4311
cb9aef006229
turning IImageWriter into a pure interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4211
diff
changeset
|
488 Orthanc::IImageWriter::WriteToMemory(w, s, accessor); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
489 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
490 { |
|
4211
afad57ac30ef
enforcing parameter "enforceAligned" in PamReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
491 Orthanc::PamReader r(true); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
492 r.ReadFromMemory(s); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
493 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
494 ASSERT_EQ(r.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
495 ASSERT_EQ(r.GetWidth(), width); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
496 ASSERT_EQ(r.GetHeight(), height); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
497 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
498 v = 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
499 for (unsigned int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
500 { |
| 2707 | 501 const uint16_t *p = reinterpret_cast<const uint16_t*> |
| 502 ((const uint8_t*) r.GetConstBuffer() + y * r.GetPitch()); | |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
503 ASSERT_EQ(p, r.GetConstRow(y)); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
504 for (unsigned int x = 0; x < width; x++, p++, v++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
505 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
506 ASSERT_EQ(v, *p); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
507 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
508 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
509 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
510 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
511 { |
|
3834
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
512 // true means "enforce alignment by using a temporary buffer" |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
513 Orthanc::PamReader r(true); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
514 r.ReadFromMemory(s); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
515 |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
516 ASSERT_EQ(r.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
517 ASSERT_EQ(r.GetWidth(), width); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
518 ASSERT_EQ(r.GetHeight(), height); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
519 |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
520 v = 0; |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
521 for (unsigned int y = 0; y < height; y++) |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
522 { |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
523 const uint16_t* p = reinterpret_cast<const uint16_t*> |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
524 ((const uint8_t*)r.GetConstBuffer() + y * r.GetPitch()); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
525 ASSERT_EQ(p, r.GetConstRow(y)); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
526 for (unsigned int x = 0; x < width; x++, p++, v++) |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
527 { |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
528 ASSERT_EQ(v, *p); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
529 } |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
530 } |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
531 } |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
532 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
533 #if ORTHANC_SANDBOXED != 1 |
|
3834
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
534 { |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
535 Orthanc::TemporaryFile tmp; |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
536 tmp.Write(s); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
537 |
|
4211
afad57ac30ef
enforcing parameter "enforceAligned" in PamReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4119
diff
changeset
|
538 Orthanc::PamReader r2(true); |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
539 r2.ReadFromFile(tmp.GetPath()); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
540 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
541 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
542 ASSERT_EQ(r2.GetWidth(), width); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
543 ASSERT_EQ(r2.GetHeight(), height); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
544 |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
545 v = 0; |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
546 for (unsigned int y = 0; y < height; y++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
547 { |
| 2707 | 548 const uint16_t *p = reinterpret_cast<const uint16_t*> |
| 549 ((const uint8_t*) r2.GetConstBuffer() + y * r2.GetPitch()); | |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
550 ASSERT_EQ(p, r2.GetConstRow(y)); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
551 for (unsigned int x = 0; x < width; x++, p++, v++) |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
552 { |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
553 ASSERT_EQ(*p, v); |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
554 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
555 } |
|
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
556 } |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
557 #endif |
|
3834
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
558 |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
559 #if ORTHANC_SANDBOXED != 1 |
|
3834
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
560 { |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
561 Orthanc::TemporaryFile tmp; |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
562 tmp.Write(s); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
563 |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
564 // true means "enforce alignment by using a temporary buffer" |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
565 Orthanc::PamReader r2(true); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
566 r2.ReadFromFile(tmp.GetPath()); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
567 |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
568 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
569 ASSERT_EQ(r2.GetWidth(), width); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
570 ASSERT_EQ(r2.GetHeight(), height); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
571 |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
572 v = 0; |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
573 for (unsigned int y = 0; y < height; y++) |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
574 { |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
575 const uint16_t* p = reinterpret_cast<const uint16_t*> |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
576 ((const uint8_t*)r2.GetConstBuffer() + y * r2.GetPitch()); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
577 ASSERT_EQ(p, r2.GetConstRow(y)); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
578 for (unsigned int x = 0; x < width; x++, p++, v++) |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
579 { |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
580 ASSERT_EQ(*p, v); |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
581 } |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
582 } |
|
219de90c1f43
Added a flag to use an extra buffer in PamReader
Benjamin Golinvaux <bgo@osimis.io>
parents:
3640
diff
changeset
|
583 } |
|
4325
b96aedfa8cc1
unit tests now running in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4311
diff
changeset
|
584 #endif |
|
2699
52217dc47a4e
new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes
am@osimis.io
parents:
2447
diff
changeset
|
585 } |
|
4642
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
586 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
587 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
588 TEST(PngWriter, Gray16Then8) |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
589 { |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
590 Orthanc::Image image16(Orthanc::PixelFormat_Grayscale16, 32, 32, false); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
591 Orthanc::Image image8(Orthanc::PixelFormat_Grayscale8, 32, 32, false); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
592 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
593 memset(image16.GetBuffer(), 0, image16.GetHeight() * image16.GetPitch()); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
594 memset(image8.GetBuffer(), 0, image8.GetHeight() * image8.GetPitch()); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
595 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
596 { |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
597 Orthanc::PamWriter w; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
598 std::string s; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
599 Orthanc::IImageWriter::WriteToMemory(w, s, image16); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
600 Orthanc::IImageWriter::WriteToMemory(w, s, image8); // No problem here |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
601 } |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
602 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
603 { |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
604 Orthanc::PamWriter w; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
605 std::string s; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
606 Orthanc::IImageWriter::WriteToMemory(w, s, image8); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
607 Orthanc::IImageWriter::WriteToMemory(w, s, image16); // No problem here |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
608 } |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
609 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
610 { |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
611 Orthanc::PngWriter w; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
612 std::string s; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
613 Orthanc::IImageWriter::WriteToMemory(w, s, image8); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
614 Orthanc::IImageWriter::WriteToMemory(w, s, image16); // No problem here |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
615 } |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
616 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
617 { |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
618 // The following call leads to "Invalid read of size 1" in Orthanc <= 1.9.2 |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
619 Orthanc::PngWriter w; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
620 std::string s; |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
621 Orthanc::IImageWriter::WriteToMemory(w, s, image16); |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
622 Orthanc::IImageWriter::WriteToMemory(w, s, image8); // Problem here |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
623 } |
|
69bbb4bd35cb
PngWriter recreates a new libpng context for each encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
624 } |