orthanc: UnitTestsSources/ImageTests.cpp annotate

annotate UnitTestsSources/ImageTests.cpp @ 2904:0dd54ee073db

float to integer grayscale conversion

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 30 Oct 2018 10:46:17 +0100
parents	38a3054b22ff
children	4767d36679ed

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 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	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
2447 878b59270859 upgrade to year 2018 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	6 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	7 * This program is free software: you can redistribute it and/or
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	8 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	10 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	11 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	12 * In addition, as a special exception, the copyright holders of this
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	13 * program give permission to link the code of its release with the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	16 * the linked executables. You must obey the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	20 * you do not wish to do so, delete this exception statement from your
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	21 * version. If you delete this exception statement from all source files
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	22 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	23 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	24 * 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	25 * 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	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	27 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	28 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	29 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	31 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	32
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 803 diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	34 #include "PrecompiledHeadersUnitTests.h"
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "gtest/gtest.h"
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	37 #include "../Core/Images/Font.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	38 #include "../Core/Images/Image.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	39 #include "../Core/Images/ImageProcessing.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	40 #include "../Core/Images/JpegReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	41 #include "../Core/Images/JpegWriter.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	42 #include "../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1611 diff changeset	43 #include "../Core/Images/PngWriter.h"
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	44 #include "../Core/Images/PamReader.h"
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	45 #include "../Core/Images/PamWriter.h"
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	46 #include "../Core/Toolbox.h"
2142 5a8840920121 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	47 #include "../Core/TemporaryFile.h"
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	48 #include "../OrthancServer/OrthancInitialization.h" // For the FontRegistry
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	49
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	50 #include <stdint.h>
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	51
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 TEST(PngWriter, ColorPattern)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 Orthanc::PngWriter w;
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	56 unsigned int width = 17;
3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	57 unsigned int height = 61;
3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	58 unsigned int pitch = width * 3;
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 std::vector<uint8_t> image(height * pitch);
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	61 for (unsigned int y = 0; y < height; y++)
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 uint8_t p = &image[0] + y pitch;
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	64 for (unsigned int x = 0; x < width; x++, p += 3)
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 p[0] = (y % 3 == 0) ? 255 : 0;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 p[1] = (y % 3 == 1) ? 255 : 0;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 p[2] = (y % 3 == 2) ? 255 : 0;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	72 Orthanc::ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	73 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	74
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	75 w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor);
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	76
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	77 std::string f, md5;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	78 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png");
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	79 Orthanc::Toolbox::ComputeMD5(md5, f);
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	80 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5);
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 TEST(PngWriter, Gray8Pattern)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 Orthanc::PngWriter w;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 int width = 17;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 int height = 256;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 int pitch = width;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 std::vector<uint8_t> image(height * pitch);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 for (int y = 0; y < height; y++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 uint8_t p = &image[0] + y pitch;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 for (int x = 0; x < width; x++, p++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 *p = y;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	100 Orthanc::ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	101 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	102
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	103 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor);
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	104
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	105 std::string f, md5;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	106 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png");
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	107 Orthanc::Toolbox::ComputeMD5(md5, f);
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	108 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5);
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 TEST(PngWriter, Gray16Pattern)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 Orthanc::PngWriter w;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 int width = 256;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 int height = 256;
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	116 int pitch = width * 2 + 16;
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 std::vector<uint8_t> image(height * pitch);
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	119
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 int v = 0;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 for (int y = 0; y < height; y++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 uint16_t p = reinterpret_cast<uint16_t>(&image[0] + y * pitch);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 for (int x = 0; x < width; x++, p++, v++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 *p = v;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	130 Orthanc::ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	131 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	132 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor);
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	133
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	134 std::string f, md5;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	135 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png");
639 51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	136 Orthanc::Toolbox::ComputeMD5(md5, f);
51892be15618 fix for big endian architectures Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	137 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5);
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 }
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	139
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	140 TEST(PngWriter, EndToEnd)
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	141 {
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	142 Orthanc::PngWriter w;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	143 unsigned int width = 256;
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	144 unsigned int height = 256;
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	145 unsigned int pitch = width * 2 + 16;
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	146
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	147 std::vector<uint8_t> image(height * pitch);
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	148
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	149 int v = 0;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	150 for (unsigned int y = 0; y < height; y++)
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	151 {
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	152 uint16_t p = reinterpret_cast<uint16_t>(&image[0] + y * pitch);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	153 for (unsigned int x = 0; x < width; x++, p++, v++)
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	154 {
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	155 *p = v;
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	156 }
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	157 }
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	158
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	159 Orthanc::ImageAccessor accessor;
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	160 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	161
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	162 std::string s;
1916 5bcf721bde4f IImageWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	163 w.WriteToMemory(s, accessor);
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	164
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	165 {
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	166 Orthanc::PngReader r;
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	167 r.ReadFromMemory(s);
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	168
710 c87a1d529e13 test pngreader Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	169 ASSERT_EQ(r.GetFormat(), Orthanc::PixelFormat_Grayscale16);
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	170 ASSERT_EQ(r.GetWidth(), width);
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	171 ASSERT_EQ(r.GetHeight(), height);
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	172
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	173 v = 0;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	174 for (unsigned int y = 0; y < height; y++)
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	175 {
797 37adac56017a ImageAccessor abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	176 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	177 ASSERT_EQ(p, r.GetConstRow(y));
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	178 for (unsigned int x = 0; x < width; x++, p++, v++)
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	179 {
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	180 ASSERT_EQ(*p, v);
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	181 }
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	182 }
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	183 }
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	184
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	185 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	186 Orthanc::TemporaryFile tmp;
aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	187 Orthanc::SystemToolbox::WriteFile(s, tmp.GetPath());
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	188
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	189 Orthanc::PngReader r2;
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	190 r2.ReadFromFile(tmp.GetPath());
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	191
710 c87a1d529e13 test pngreader Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	192 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16);
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	193 ASSERT_EQ(r2.GetWidth(), width);
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	194 ASSERT_EQ(r2.GetHeight(), height);
710 c87a1d529e13 test pngreader Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	195
c87a1d529e13 test pngreader Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	196 v = 0;
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	197 for (unsigned int y = 0; y < height; y++)
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	198 {
797 37adac56017a ImageAccessor abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	199 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	200 ASSERT_EQ(p, r2.GetConstRow(y));
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1288 diff changeset	201 for (unsigned int x = 0; x < width; x++, p++, v++)
709 6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	202 {
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	203 ASSERT_EQ(*p, v);
6c90ce085261 zlib tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 639 diff changeset	204 }
455 238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	205 }
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	206 }
238a0c99ced2 PNG reader Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	207 }
1602 292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	208
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	209
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	210
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	211
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	212 TEST(JpegWriter, Basic)
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	213 {
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	214 std::string s;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	215
1602 292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	216 {
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	217 Orthanc::Image img(Orthanc::PixelFormat_Grayscale8, 16, 16, false);
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	218 for (unsigned int y = 0, value = 0; y < img.GetHeight(); y++)
1602 292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	219 {
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1604 diff changeset	220 uint8_t* p = reinterpret_cast<uint8_t*>(img.GetRow(y));
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	221 for (unsigned int x = 0; x < img.GetWidth(); x++, p++)
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	222 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	223 *p = value++;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	224 }
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	225 }
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	226
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	227 Orthanc::JpegWriter w;
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1604 diff changeset	228 w.WriteToFile("UnitTestsResults/hello.jpg", img);
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	229
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1604 diff changeset	230 w.WriteToMemory(s, img);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	231 Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg");
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	232
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	233 std::string t;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	234 Orthanc::SystemToolbox::ReadFile(t, "UnitTestsResults/hello.jpg");
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	235 ASSERT_EQ(s.size(), t.size());
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	236 ASSERT_EQ(0, memcmp(s.c_str(), t.c_str(), s.size()));
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	237 }
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	238
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	239 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	240 Orthanc::JpegReader r1, r2;
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	241 r1.ReadFromFile("UnitTestsResults/hello.jpg");
1970 a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	242 ASSERT_EQ(16u, r1.GetWidth());
a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	243 ASSERT_EQ(16u, r1.GetHeight());
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	244
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	245 r2.ReadFromMemory(s);
1970 a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	246 ASSERT_EQ(16u, r2.GetWidth());
a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	247 ASSERT_EQ(16u, r2.GetHeight());
1604 1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	248
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	249 for (unsigned int y = 0; y < r1.GetHeight(); y++)
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	250 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	251 const uint8_t* p1 = reinterpret_cast<const uint8_t*>(r1.GetConstRow(y));
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	252 const uint8_t* p2 = reinterpret_cast<const uint8_t*>(r2.GetConstRow(y));
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	253 for (unsigned int x = 0; x < r1.GetWidth(); x++)
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	254 {
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	255 ASSERT_EQ(p1, p2);
1f5d6a2f9638 JpegReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	256 }
1602 292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	257 }
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	258 }
292bce3f54ed JpegWriter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	259 }
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	260
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	261
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	262 TEST(Font, Basic)
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	263 {
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	264 Orthanc::Image s(Orthanc::PixelFormat_RGB24, 640, 480, false);
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	265 memset(s.GetBuffer(), 0, s.GetPitch() * s.GetHeight());
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	266
1970 a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1916 diff changeset	267 ASSERT_GE(1u, Orthanc::Configuration::GetFontRegistry().GetSize());
1611 5e9b2aac8b89 fix for visual studio Sebastien Jodogne <s.jodogne@gmail.com> parents: 1610 diff changeset	268 Orthanc::Configuration::GetFontRegistry().GetFont(0).Draw(s, "Hello world É\n\rComment ça va ?\nq", 50, 60, 255, 0, 0);
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	269
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	270 Orthanc::PngWriter w;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	271 w.WriteToFile("UnitTestsResults/font.png", s);
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	272 }
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	273
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	274 TEST(PamWriter, ColorPattern)
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	275 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	276 Orthanc::PamWriter w;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	277 unsigned int width = 17;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	278 unsigned int height = 61;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	279 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	280
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	281 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	282 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	283 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	284 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	285 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	286 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	287 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	288 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	289 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	290 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	291 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	292
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	293 Orthanc::ImageAccessor accessor;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	294 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	295
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	296 w.WriteToFile("UnitTestsResults/ColorPattern.pam", accessor);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	297
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	298 std::string f, md5;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	299 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.pam");
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	300 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	301 ASSERT_EQ("81a3441754e88969ebbe53e69891e841", md5);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	302 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	303
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	304 TEST(PamWriter, Gray8Pattern)
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	305 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	306 Orthanc::PamWriter w;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	307 int width = 17;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	308 int height = 256;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	309 int pitch = width;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	310
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	311 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	312 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	313 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	314 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	315 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	316 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	317 *p = y;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	318 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	319 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	320
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	321 Orthanc::ImageAccessor accessor;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	322 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	323
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	324 w.WriteToFile("UnitTestsResults/Gray8Pattern.pam", accessor);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	325
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	326 std::string f, md5;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	327 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.pam");
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	328 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	329 ASSERT_EQ("7873c408d26a9d11dd1c1de5e69cc0a3", md5);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	330 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	331
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	332 TEST(PamWriter, Gray16Pattern)
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	333 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	334 Orthanc::PamWriter w;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	335 int width = 256;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	336 int height = 256;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	337 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	338
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	339 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	340
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	341 int v = 0;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	342 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	343 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	344 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	345 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	346 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	347 *p = v;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	348 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	349 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	350
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	351 Orthanc::ImageAccessor accessor;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	352 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	353 w.WriteToFile("UnitTestsResults/Gray16Pattern.pam", accessor);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	354
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	355 std::string f, md5;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	356 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.pam");
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	357 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	358 ASSERT_EQ("b268772bf28f3b2b8520ff21c5e3dcb6", md5);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	359 }
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 TEST(PamWriter, EndToEnd)
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	362 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	363 Orthanc::PamWriter w;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	364 unsigned int width = 256;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	365 unsigned int height = 256;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	366 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	367
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	368 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	369
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	370 int v = 0;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	371 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	372 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	373 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	374 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	375 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	376 *p = v;
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 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	379
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	380 Orthanc::ImageAccessor accessor;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	381 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	382
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	383 std::string s;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	384 w.WriteToMemory(s, accessor);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	385
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	386 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	387 Orthanc::PamReader r;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	388 r.ReadFromMemory(s);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	389
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	390 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	391 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	392 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	393
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	394 v = 0;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	395 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	396 {
2707 38a3054b22ff improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	397 const uint16_t p = reinterpret_cast<const uint16_t>
38a3054b22ff improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	398 ((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	399 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	400 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	401 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	402 ASSERT_EQ(v, *p);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	403 }
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 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	406
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 Orthanc::TemporaryFile tmp;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	409 Orthanc::SystemToolbox::WriteFile(s, tmp.GetPath());
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 Orthanc::PamReader r2;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	412 r2.ReadFromFile(tmp.GetPath());
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	413
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	414 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	415 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	416 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	417
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	418 v = 0;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	419 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	420 {
2707 38a3054b22ff improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	421 const uint16_t p = reinterpret_cast<const uint16_t>
38a3054b22ff improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 2699 diff changeset	422 ((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	423 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	424 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	425 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2447 diff changeset	426 ASSERT_EQ(*p, v);
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 }
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

Mercurial > hg > orthanc

annotate UnitTestsSources/ImageTests.cpp @ 2904:0dd54ee073db