orthanc: Core/Images/ImageProcessing.cpp annotate

annotate Core/Images/ImageProcessing.cpp @ 3498:957e06cbe76a

additional check

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 22 Aug 2019 15:02:19 +0200
parents	e0841192d7d0
children	d8f7c3970e25

rev	line source
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 993 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2918 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	23 *
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "../PrecompiledHeaders.h"
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "ImageProcessing.h"
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	37 #include "PixelTraits.h"
2895 da43ef7ff32a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2840 diff changeset	38 #include "../OrthancException.h"
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	40 #include <boost/math/special_functions/round.hpp>
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	41
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include <cassert>
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include <string.h>
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	44 #include <limits>
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	45 #include <stdint.h>
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	46 #include <algorithm>
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	47
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 namespace Orthanc
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
3265 59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	50 double ImageProcessing::ImagePoint::GetDistanceTo(const ImagePoint& other) const
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	51 {
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	52 double dx = (double)(other.GetX() - GetX());
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	53 double dy = (double)(other.GetY() - GetY());
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	54 return sqrt(dx * dx + dy * dy);
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	55 }
59a184cbb596 ImagePoint::Set + GetDistanceTo Alain Mazy <alain@mazy.be> parents: 3259 diff changeset	56
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	57 template <typename TargetType, typename SourceType>
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	58 static void ConvertInternal(ImageAccessor& target,
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	59 const ImageAccessor& source)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	60 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	61 const TargetType minValue = std::numeric_limits<TargetType>::min();
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	62 const TargetType maxValue = std::numeric_limits<TargetType>::max();
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	63
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	64 const unsigned int width = source.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	65 const unsigned int height = source.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	66
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	67 for (unsigned int y = 0; y < height; y++)
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	68 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	69 TargetType* t = reinterpret_cast<TargetType*>(target.GetRow(y));
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	70 const SourceType* s = reinterpret_cast<const SourceType*>(source.GetConstRow(y));
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	71
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	72 for (unsigned int x = 0; x < width; x++, t++, s++)
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	73 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	74 if (static_cast<int32_t>(*s) < static_cast<int32_t>(minValue))
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	75 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	76 *t = minValue;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	77 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	78 else if (static_cast<int32_t>(*s) > static_cast<int32_t>(maxValue))
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	79 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	80 *t = maxValue;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	81 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	82 else
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	83 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	84 t = static_cast<TargetType>(s);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	85 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	86 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	87 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	88 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	89
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	90
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	91 template <typename SourceType>
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	92 static void ConvertGrayscaleToFloat(ImageAccessor& target,
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	93 const ImageAccessor& source)
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	94 {
1994 4d099fee5eca ImageProcessing::Set for float images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1993 diff changeset	95 assert(sizeof(float) == 4);
4d099fee5eca ImageProcessing::Set for float images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1993 diff changeset	96
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	97 const unsigned int width = source.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	98 const unsigned int height = source.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	99
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	100 for (unsigned int y = 0; y < height; y++)
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	101 {
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	102 float* t = reinterpret_cast<float*>(target.GetRow(y));
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	103 const SourceType* s = reinterpret_cast<const SourceType*>(source.GetConstRow(y));
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	104
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	105 for (unsigned int x = 0; x < width; x++, t++, s++)
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	106 {
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	107 t = static_cast<float>(s);
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	108 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	109 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	110 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	111
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	112
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	113 template <PixelFormat TargetFormat>
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	114 static void ConvertFloatToGrayscale(ImageAccessor& target,
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	115 const ImageAccessor& source)
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	116 {
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	117 typedef typename PixelTraits<TargetFormat>::PixelType TargetType;
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	118
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	119 assert(sizeof(float) == 4);
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	120
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	121 const unsigned int width = source.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	122 const unsigned int height = source.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	123
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	124 for (unsigned int y = 0; y < height; y++)
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	125 {
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	126 TargetType* q = reinterpret_cast<TargetType*>(target.GetRow(y));
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	127 const float* p = reinterpret_cast<const float*>(source.GetConstRow(y));
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	128
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	129 for (unsigned int x = 0; x < width; x++, p++, q++)
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	130 {
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	131 PixelTraits<TargetFormat>::FloatToPixel(q, p);
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	132 }
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	133 }
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	134 }
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	135
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	136
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	137 template <typename TargetType>
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	138 static void ConvertColorToGrayscale(ImageAccessor& target,
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	139 const ImageAccessor& source)
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	140 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	141 assert(source.GetFormat() == PixelFormat_RGB24);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	142
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	143 const TargetType minValue = std::numeric_limits<TargetType>::min();
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	144 const TargetType maxValue = std::numeric_limits<TargetType>::max();
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	145
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	146 const unsigned int width = source.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	147 const unsigned int height = source.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	148
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	149 for (unsigned int y = 0; y < height; y++)
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	150 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	151 TargetType* t = reinterpret_cast<TargetType*>(target.GetRow(y));
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	152 const uint8_t* s = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	153
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	154 for (unsigned int x = 0; x < width; x++, t++, s += 3)
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	155 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	156 // Y = 0.2126 R + 0.7152 G + 0.0722 B
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	157 int32_t v = (2126 * static_cast<int32_t>(s[0]) +
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	158 7152 * static_cast<int32_t>(s[1]) +
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	159 0722 * static_cast<int32_t>(s[2])) / 10000;
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	160
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	161 if (static_cast<int32_t>(v) < static_cast<int32_t>(minValue))
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	162 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	163 *t = minValue;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	164 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	165 else if (static_cast<int32_t>(v) > static_cast<int32_t>(maxValue))
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	166 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	167 *t = maxValue;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	168 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	169 else
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	170 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	171 *t = static_cast<TargetType>(v);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	172 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	173 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	174 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	175 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	176
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	177
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	178 static void MemsetZeroInternal(ImageAccessor& image)
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	179 {
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	180 const unsigned int height = image.GetHeight();
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	181 const size_t lineSize = image.GetBytesPerPixel() * image.GetWidth();
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	182 const size_t pitch = image.GetPitch();
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	183
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	184 uint8_t p = reinterpret_cast<uint8_t>(image.GetBuffer());
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	185
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	186 for (unsigned int y = 0; y < height; y++)
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	187 {
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	188 memset(p, 0, lineSize);
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	189 p += pitch;
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	190 }
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	191 }
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	192
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	193
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	194 template <typename PixelType>
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	195 static void SetInternal(ImageAccessor& image,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	196 int64_t constant)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	197 {
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	198 if (constant == 0 &&
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	199 (image.GetFormat() == PixelFormat_Grayscale8 \|\|
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	200 image.GetFormat() == PixelFormat_Grayscale16 \|\|
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	201 image.GetFormat() == PixelFormat_Grayscale32 \|\|
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	202 image.GetFormat() == PixelFormat_Grayscale64 \|\|
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	203 image.GetFormat() == PixelFormat_SignedGrayscale16))
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	204 {
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	205 MemsetZeroInternal(image);
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	206 }
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	207 else
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	208 {
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	209 const unsigned int width = image.GetWidth();
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	210 const unsigned int height = image.GetHeight();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	211
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	212 for (unsigned int y = 0; y < height; y++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	213 {
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	214 PixelType* p = reinterpret_cast<PixelType*>(image.GetRow(y));
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	215
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	216 for (unsigned int x = 0; x < width; x++, p++)
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	217 {
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	218 *p = static_cast<PixelType>(constant);
e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	219 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	220 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	221 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	222 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	223
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	224
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	225 template <typename PixelType>
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	226 static void GetMinMaxValueInternal(PixelType& minValue,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	227 PixelType& maxValue,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	228 const ImageAccessor& source)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	229 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	230 // Deal with the special case of empty image
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	231 if (source.GetWidth() == 0 \|\|
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	232 source.GetHeight() == 0)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	233 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	234 minValue = 0;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	235 maxValue = 0;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	236 return;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	237 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	238
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	239 minValue = std::numeric_limits<PixelType>::max();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	240 maxValue = std::numeric_limits<PixelType>::min();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	241
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	242 const unsigned int height = source.GetHeight();
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	243 const unsigned int width = source.GetWidth();
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	244
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	245 for (unsigned int y = 0; y < height; y++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	246 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	247 const PixelType* p = reinterpret_cast<const PixelType*>(source.GetConstRow(y));
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	248
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	249 for (unsigned int x = 0; x < width; x++, p++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	250 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	251 if (*p < minValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	252 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	253 minValue = *p;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	254 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	255
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	256 if (*p > maxValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	257 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	258 maxValue = *p;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	259 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	260 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	261 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	262 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	263
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	264
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	265
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	266 template <typename PixelType>
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	267 static void AddConstantInternal(ImageAccessor& image,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	268 int64_t constant)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	269 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	270 if (constant == 0)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	271 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	272 return;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	273 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	274
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	275 const int64_t minValue = std::numeric_limits<PixelType>::min();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	276 const int64_t maxValue = std::numeric_limits<PixelType>::max();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	277
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	278 const unsigned int width = image.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	279 const unsigned int height = image.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	280
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	281 for (unsigned int y = 0; y < height; y++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	282 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	283 PixelType* p = reinterpret_cast<PixelType*>(image.GetRow(y));
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	284
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	285 for (unsigned int x = 0; x < width; x++, p++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	286 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	287 int64_t v = static_cast<int64_t>(*p) + constant;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	288
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	289 if (v > maxValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	290 {
876 e21d1a5f5934 fix msvc warnings jodogne parents: 863 diff changeset	291 *p = std::numeric_limits<PixelType>::max();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	292 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	293 else if (v < minValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	294 {
876 e21d1a5f5934 fix msvc warnings jodogne parents: 863 diff changeset	295 *p = std::numeric_limits<PixelType>::min();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	296 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	297 else
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	298 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	299 *p = static_cast<PixelType>(v);
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	300 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	301 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	302 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	303 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	304
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	305
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	306
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	307 template <typename PixelType,
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	308 bool UseRound>
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	309 static void MultiplyConstantInternal(ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	310 float factor)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	311 {
1334 7f0aa3c0f659 code improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	312 if (std::abs(factor - 1.0f) <= std::numeric_limits<float>::epsilon())
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	313 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	314 return;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	315 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	316
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	317 const int64_t minValue = std::numeric_limits<PixelType>::min();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	318 const int64_t maxValue = std::numeric_limits<PixelType>::max();
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	319
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	320 const unsigned int width = image.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	321 const unsigned int height = image.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	322
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	323 for (unsigned int y = 0; y < height; y++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	324 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	325 PixelType* p = reinterpret_cast<PixelType*>(image.GetRow(y));
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	326
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	327 for (unsigned int x = 0; x < width; x++, p++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	328 {
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	329 int64_t v;
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	330 if (UseRound)
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	331 {
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	332 // The "round" operation is very costly
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	333 v = boost::math::llround(static_cast<float>(p) factor);
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	334 }
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	335 else
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	336 {
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	337 v = static_cast<int64_t>(static_cast<float>(p) factor);
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	338 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	339
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	340 if (v > maxValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	341 {
876 e21d1a5f5934 fix msvc warnings jodogne parents: 863 diff changeset	342 *p = std::numeric_limits<PixelType>::max();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	343 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	344 else if (v < minValue)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	345 {
876 e21d1a5f5934 fix msvc warnings jodogne parents: 863 diff changeset	346 *p = std::numeric_limits<PixelType>::min();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	347 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	348 else
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	349 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	350 *p = static_cast<PixelType>(v);
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	351 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	352 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	353 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	354 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	355
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	356
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	357 template <typename PixelType,
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	358 bool UseRound>
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	359 static void ShiftScaleInternal(ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	360 float offset,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	361 float scaling)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	362 {
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	363 const float minFloatValue = static_cast<float>(std::numeric_limits<PixelType>::min());
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	364 const float maxFloatValue = static_cast<float>(std::numeric_limits<PixelType>::max());
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	365 const PixelType minPixelValue = std::numeric_limits<PixelType>::min();
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	366 const PixelType maxPixelValue = std::numeric_limits<PixelType>::max();
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	367
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	368 const unsigned int height = image.GetHeight();
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	369 const unsigned int width = image.GetWidth();
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	370
509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	371 for (unsigned int y = 0; y < height; y++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	372 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	373 PixelType* p = reinterpret_cast<PixelType*>(image.GetRow(y));
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	374
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	375 for (unsigned int x = 0; x < width; x++, p++)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	376 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	377 float v = (static_cast<float>(p) + offset) scaling;
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	378
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	379 if (v > maxFloatValue)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	380 {
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	381 *p = maxPixelValue;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	382 }
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	383 else if (v < minFloatValue)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	384 {
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	385 *p = minPixelValue;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	386 }
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	387 else if (UseRound)
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	388 {
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	389 // The "round" operation is very costly
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	390 *p = static_cast<PixelType>(boost::math::iround(v));
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	391 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	392 else
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	393 {
2482 509041cb57db speedup by truncating instead of rounding Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	394 *p = static_cast<PixelType>(v);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	395 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	396 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	397 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	398 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	399
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	400
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 void ImageProcessing::Copy(ImageAccessor& target,
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 const ImageAccessor& source)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 if (target.GetWidth() != source.GetWidth() \|\|
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 target.GetHeight() != source.GetHeight())
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 throw OrthancException(ErrorCode_IncompatibleImageSize);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 if (target.GetFormat() != source.GetFormat())
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 throw OrthancException(ErrorCode_IncompatibleImageFormat);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
2902 e80b38fb22c6 fix ImageProcessing::Set() for subregions Sebastien Jodogne <s.jodogne@gmail.com> parents: 2895 diff changeset	415 unsigned int lineSize = source.GetBytesPerPixel() * source.GetWidth();
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 assert(source.GetPitch() >= lineSize && target.GetPitch() >= lineSize);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 for (unsigned int y = 0; y < source.GetHeight(); y++)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	421 memcpy(target.GetRow(y), source.GetConstRow(y), lineSize);
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	425
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 void ImageProcessing::Convert(ImageAccessor& target,
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 const ImageAccessor& source)
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 if (target.GetWidth() != source.GetWidth() \|\|
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 target.GetHeight() != source.GetHeight())
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 throw OrthancException(ErrorCode_IncompatibleImageSize);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 }
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	435 const unsigned int width = source.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	436 const unsigned int height = source.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	437
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 if (source.GetFormat() == target.GetFormat())
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 Copy(target, source);
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 return;
839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	443
859 610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	444 if (target.GetFormat() == PixelFormat_Grayscale16 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	445 source.GetFormat() == PixelFormat_Grayscale8)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	446 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	447 ConvertInternal<uint16_t, uint8_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	448 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	449 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	450
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	451 if (target.GetFormat() == PixelFormat_SignedGrayscale16 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	452 source.GetFormat() == PixelFormat_Grayscale8)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	453 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	454 ConvertInternal<int16_t, uint8_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	455 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	456 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	457
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	458 if (target.GetFormat() == PixelFormat_Grayscale8 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	459 source.GetFormat() == PixelFormat_Grayscale16)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	460 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	461 ConvertInternal<uint8_t, uint16_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	462 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	463 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	464
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	465 if (target.GetFormat() == PixelFormat_SignedGrayscale16 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	466 source.GetFormat() == PixelFormat_Grayscale16)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	467 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	468 ConvertInternal<int16_t, uint16_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	469 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	470 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	471
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	472 if (target.GetFormat() == PixelFormat_Grayscale8 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	473 source.GetFormat() == PixelFormat_SignedGrayscale16)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	474 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	475 ConvertInternal<uint8_t, int16_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	476 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	477 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	478
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	479 if (target.GetFormat() == PixelFormat_Grayscale16 &&
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	480 source.GetFormat() == PixelFormat_SignedGrayscale16)
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	481 {
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	482 ConvertInternal<uint16_t, int16_t>(target, source);
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	483 return;
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	484 }
610a9a1ed855 ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 854 diff changeset	485
993 501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	486 if (target.GetFormat() == PixelFormat_Grayscale8 &&
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	487 source.GetFormat() == PixelFormat_RGB24)
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	488 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	489 ConvertColorToGrayscale<uint8_t>(target, source);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	490 return;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	491 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	492
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	493 if (target.GetFormat() == PixelFormat_Grayscale16 &&
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	494 source.GetFormat() == PixelFormat_RGB24)
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	495 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	496 ConvertColorToGrayscale<uint16_t>(target, source);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	497 return;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	498 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	499
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	500 if (target.GetFormat() == PixelFormat_SignedGrayscale16 &&
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	501 source.GetFormat() == PixelFormat_RGB24)
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	502 {
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	503 ConvertColorToGrayscale<int16_t>(target, source);
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	504 return;
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	505 }
501880d76474 improvements to GDCM plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 876 diff changeset	506
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	507 if (target.GetFormat() == PixelFormat_Float32 &&
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	508 source.GetFormat() == PixelFormat_Grayscale8)
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	509 {
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	510 ConvertGrayscaleToFloat<uint8_t>(target, source);
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	511 return;
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	512 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	513
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	514 if (target.GetFormat() == PixelFormat_Float32 &&
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	515 source.GetFormat() == PixelFormat_Grayscale16)
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	516 {
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	517 ConvertGrayscaleToFloat<uint16_t>(target, source);
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	518 return;
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	519 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	520
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	521 if (target.GetFormat() == PixelFormat_Float32 &&
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	522 source.GetFormat() == PixelFormat_Grayscale32)
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	523 {
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	524 ConvertGrayscaleToFloat<uint32_t>(target, source);
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	525 return;
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	526 }
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	527
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	528 if (target.GetFormat() == PixelFormat_Float32 &&
1993 e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	529 source.GetFormat() == PixelFormat_SignedGrayscale16)
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	530 {
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	531 ConvertGrayscaleToFloat<int16_t>(target, source);
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	532 return;
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	533 }
e2a3ff770b48 introducing float32 images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1992 diff changeset	534
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	535
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	536 if (target.GetFormat() == PixelFormat_Grayscale8 &&
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	537 source.GetFormat() == PixelFormat_RGBA32)
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	538 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	539 for (unsigned int y = 0; y < height; y++)
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	540 {
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	541 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	542 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	543 for (unsigned int x = 0; x < width; x++, q++)
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	544 {
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	545 q = static_cast<uint8_t>((2126 static_cast<uint32_t>(p[0]) +
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	546 7152 * static_cast<uint32_t>(p[1]) +
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	547 0722 * static_cast<uint32_t>(p[2])) / 10000);
1610 2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	548 p += 4;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	549 }
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	550 }
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	551
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	552 return;
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	553 }
2dff2bdffdb8 font support within Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1608 diff changeset	554
2840 f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	555 if (target.GetFormat() == PixelFormat_Grayscale8 &&
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	556 source.GetFormat() == PixelFormat_BGRA32)
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	557 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	558 for (unsigned int y = 0; y < height; y++)
2840 f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	559 {
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	560 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	561 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	562 for (unsigned int x = 0; x < width; x++, q++)
2840 f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	563 {
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	564 q = static_cast<uint8_t>((2126 static_cast<uint32_t>(p[2]) +
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	565 7152 * static_cast<uint32_t>(p[1]) +
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	566 0722 * static_cast<uint32_t>(p[0])) / 10000);
2840 f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	567 p += 4;
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	568 }
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	569 }
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	570
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	571 return;
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	572 }
f4c232bba1eb bgra32 to grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2783 diff changeset	573
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	574 if (target.GetFormat() == PixelFormat_RGB24 &&
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	575 source.GetFormat() == PixelFormat_RGBA32)
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	576 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	577 for (unsigned int y = 0; y < height; y++)
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	578 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	579 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	580 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	581 for (unsigned int x = 0; x < width; x++)
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	582 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	583 q[0] = p[0];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	584 q[1] = p[1];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	585 q[2] = p[2];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	586 p += 4;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	587 q += 3;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	588 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	589 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	590
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	591 return;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	592 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	593
2252 002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	594 if (target.GetFormat() == PixelFormat_RGB24 &&
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	595 source.GetFormat() == PixelFormat_BGRA32)
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	596 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	597 for (unsigned int y = 0; y < height; y++)
2252 002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	598 {
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	599 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	600 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	601 for (unsigned int x = 0; x < width; x++)
2252 002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	602 {
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	603 q[0] = p[2];
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	604 q[1] = p[1];
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	605 q[2] = p[0];
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	606 p += 4;
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	607 q += 3;
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	608 }
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	609 }
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	610
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	611 return;
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	612 }
002b94046c69 colorspace conversion from BGRA32 to RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	613
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	614 if (target.GetFormat() == PixelFormat_RGBA32 &&
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	615 source.GetFormat() == PixelFormat_RGB24)
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	616 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	617 for (unsigned int y = 0; y < height; y++)
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	618 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	619 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	620 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	621 for (unsigned int x = 0; x < width; x++)
1608 adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	622 {
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	623 q[0] = p[0];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	624 q[1] = p[1];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	625 q[2] = p[2];
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	626 q[3] = 255; // Set the alpha channel to full opacity
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	627 p += 3;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	628 q += 4;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	629 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	630 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	631
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	632 return;
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	633 }
adc6a5704cdb OrthancPluginConvertPixelFormat Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	634
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	635 if (target.GetFormat() == PixelFormat_RGB24 &&
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	636 source.GetFormat() == PixelFormat_Grayscale8)
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	637 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	638 for (unsigned int y = 0; y < height; y++)
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	639 {
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	640 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	641 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	642 for (unsigned int x = 0; x < width; x++)
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	643 {
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	644 q[0] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	645 q[1] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	646 q[2] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	647 p += 1;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	648 q += 3;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	649 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	650 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	651
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	652 return;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	653 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	654
2650 5f2dd8b6ee2f cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2645 diff changeset	655 if ((target.GetFormat() == PixelFormat_RGBA32 \|\|
5f2dd8b6ee2f cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2645 diff changeset	656 target.GetFormat() == PixelFormat_BGRA32) &&
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	657 source.GetFormat() == PixelFormat_Grayscale8)
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	658 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	659 for (unsigned int y = 0; y < height; y++)
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	660 {
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	661 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	662 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	663 for (unsigned int x = 0; x < width; x++)
1992 9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	664 {
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	665 q[0] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	666 q[1] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	667 q[2] = *p;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	668 q[3] = 255;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	669 p += 1;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	670 q += 4;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	671 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	672 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	673
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	674 return;
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	675 }
9161e3ef0d17 new conversions in ImageProcessing::Convert Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	676
2100 1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	677 if (target.GetFormat() == PixelFormat_BGRA32 &&
2495 cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	678 source.GetFormat() == PixelFormat_Grayscale16)
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	679 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	680 for (unsigned int y = 0; y < height; y++)
2495 cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	681 {
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	682 const uint16_t* p = reinterpret_cast<const uint16_t*>(source.GetConstRow(y));
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	683 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	684 for (unsigned int x = 0; x < width; x++)
2495 cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	685 {
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	686 uint8_t value = (p < 256 ? p : 255);
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	687 q[0] = value;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	688 q[1] = value;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	689 q[2] = value;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	690 q[3] = 255;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	691 p += 1;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	692 q += 4;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	693 }
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	694 }
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	695
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	696 return;
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	697 }
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	698
cd7b854dbc05 convert grayscale16 to bgra32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2491 diff changeset	699 if (target.GetFormat() == PixelFormat_BGRA32 &&
2496 3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	700 source.GetFormat() == PixelFormat_SignedGrayscale16)
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	701 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	702 for (unsigned int y = 0; y < height; y++)
2496 3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	703 {
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	704 const int16_t* p = reinterpret_cast<const int16_t*>(source.GetConstRow(y));
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	705 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	706 for (unsigned int x = 0; x < width; x++)
2496 3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	707 {
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	708 uint8_t value;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	709 if (*p < 0)
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	710 {
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	711 value = 0;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	712 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	713 else if (*p > 255)
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	714 {
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	715 value = 255;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	716 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	717 else
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	718 {
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	719 value = static_cast<uint8_t>(*p);
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	720 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	721
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	722 q[0] = value;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	723 q[1] = value;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	724 q[2] = value;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	725 q[3] = 255;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	726 p += 1;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	727 q += 4;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	728 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	729 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	730
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	731 return;
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	732 }
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	733
3d65adee289a int16_t to rgba32 conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2495 diff changeset	734 if (target.GetFormat() == PixelFormat_BGRA32 &&
2100 1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	735 source.GetFormat() == PixelFormat_RGB24)
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	736 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	737 for (unsigned int y = 0; y < height; y++)
2100 1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	738 {
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	739 const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	740 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	741 for (unsigned int x = 0; x < width; x++)
2100 1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	742 {
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	743 q[0] = p[2];
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	744 q[1] = p[1];
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	745 q[2] = p[0];
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	746 q[3] = 255;
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	747 p += 3;
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	748 q += 4;
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	749 }
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	750 }
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	751
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	752 return;
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	753 }
1554fc153a93 conversion RGB24 to BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2089 diff changeset	754
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	755 if (target.GetFormat() == PixelFormat_RGB24 &&
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	756 source.GetFormat() == PixelFormat_RGB48)
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	757 {
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	758 for (unsigned int y = 0; y < height; y++)
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	759 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	760 const uint16_t* p = reinterpret_cast<const uint16_t*>(source.GetConstRow(y));
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	761 uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	762 for (unsigned int x = 0; x < width; x++)
2423 5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	763 {
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	764 q[0] = p[0] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	765 q[1] = p[1] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	766 q[2] = p[2] >> 8;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	767 p += 3;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	768 q += 3;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	769 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	770 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	771
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	772 return;
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	773 }
5a7c5c541a1d Built-in decoding of palette images Sebastien Jodogne <s.jodogne@gmail.com> parents: 2415 diff changeset	774
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	775 if (target.GetFormat() == PixelFormat_Grayscale16 &&
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	776 source.GetFormat() == PixelFormat_Float32)
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	777 {
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	778 ConvertFloatToGrayscale<PixelFormat_Grayscale16>(target, source);
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	779 return;
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	780 }
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	781
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	782 if (target.GetFormat() == PixelFormat_Grayscale8 &&
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	783 source.GetFormat() == PixelFormat_Float32)
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	784 {
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	785 ConvertFloatToGrayscale<PixelFormat_Grayscale8>(target, source);
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	786 return;
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	787 }
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	788
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	789 throw OrthancException(ErrorCode_NotImplemented);
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 }
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	791
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	792
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	793
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	794 void ImageProcessing::Set(ImageAccessor& image,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	795 int64_t value)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	796 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	797 switch (image.GetFormat())
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	798 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	799 case PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	800 SetInternal<uint8_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	801 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	802
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	803 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	804 SetInternal<uint16_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	805 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	806
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	807 case PixelFormat_Grayscale32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	808 SetInternal<uint32_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	809 return;
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	810
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	811 case PixelFormat_Grayscale64:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	812 SetInternal<uint64_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	813 return;
2645 89b789366596 Grayscale64 pixel format Sebastien Jodogne <s.jodogne@gmail.com> parents: 2496 diff changeset	814
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	815 case PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	816 SetInternal<int16_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	817 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	818
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	819 case PixelFormat_Float32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	820 assert(sizeof(float) == 4);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	821 SetInternal<float>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	822 return;
1994 4d099fee5eca ImageProcessing::Set for float images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1993 diff changeset	823
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	824 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	825 throw OrthancException(ErrorCode_NotImplemented);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	826 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	827 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	828
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	829
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	830 void ImageProcessing::Set(ImageAccessor& image,
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	831 uint8_t red,
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	832 uint8_t green,
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	833 uint8_t blue,
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	834 uint8_t alpha)
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	835 {
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	836 uint8_t p[4];
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	837 unsigned int size;
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	838
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	839 switch (image.GetFormat())
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	840 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	841 case PixelFormat_RGBA32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	842 p[0] = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	843 p[1] = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	844 p[2] = blue;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	845 p[3] = alpha;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	846 size = 4;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	847 break;
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	848
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	849 case PixelFormat_BGRA32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	850 p[0] = blue;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	851 p[1] = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	852 p[2] = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	853 p[3] = alpha;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	854 size = 4;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	855 break;
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	856
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	857 case PixelFormat_RGB24:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	858 p[0] = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	859 p[1] = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	860 p[2] = blue;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	861 size = 3;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	862 break;
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	863
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	864 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	865 throw OrthancException(ErrorCode_NotImplemented);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	866 }
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	867
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	868 const unsigned int width = image.GetWidth();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	869 const unsigned int height = image.GetHeight();
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	870
0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	871 for (unsigned int y = 0; y < height; y++)
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	872 {
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	873 uint8_t* q = reinterpret_cast<uint8_t*>(image.GetRow(y));
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	874
2904 0dd54ee073db float to integer grayscale conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2902 diff changeset	875 for (unsigned int x = 0; x < width; x++)
2089 7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	876 {
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	877 for (unsigned int i = 0; i < size; i++)
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	878 {
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	879 q[i] = p[i];
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	880 }
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	881
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	882 q += size;
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	883 }
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	884 }
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	885 }
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	886
7a969f235adf PixelFormat_BGRA32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1994 diff changeset	887
854 ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	888 void ImageProcessing::ShiftRight(ImageAccessor& image,
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	889 unsigned int shift)
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	890 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	891 if (image.GetWidth() == 0 \|\|
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	892 image.GetHeight() == 0 \|\|
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	893 shift == 0)
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	894 {
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	895 // Nothing to do
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	896 return;
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	897 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	898
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	899 throw OrthancException(ErrorCode_NotImplemented);
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	900 }
ff530685e46a fast version of image copy Sebastien Jodogne <s.jodogne@gmail.com> parents: 853 diff changeset	901
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	902
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	903 void ImageProcessing::GetMinMaxIntegerValue(int64_t& minValue,
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	904 int64_t& maxValue,
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	905 const ImageAccessor& image)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	906 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	907 switch (image.GetFormat())
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	908 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	909 case PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	910 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	911 uint8_t a, b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	912 GetMinMaxValueInternal<uint8_t>(a, b, image);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	913 minValue = a;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	914 maxValue = b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	915 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	916 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	917
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	918 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	919 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	920 uint16_t a, b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	921 GetMinMaxValueInternal<uint16_t>(a, b, image);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	922 minValue = a;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	923 maxValue = b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	924 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	925 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	926
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	927 case PixelFormat_Grayscale32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	928 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	929 uint32_t a, b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	930 GetMinMaxValueInternal<uint32_t>(a, b, image);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	931 minValue = a;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	932 maxValue = b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	933 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	934 }
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	935
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	936 case PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	937 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	938 int16_t a, b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	939 GetMinMaxValueInternal<int16_t>(a, b, image);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	940 minValue = a;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	941 maxValue = b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	942 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	943 }
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	944
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	945 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	946 throw OrthancException(ErrorCode_NotImplemented);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	947 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	948 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	949
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	950
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	951 void ImageProcessing::GetMinMaxFloatValue(float& minValue,
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	952 float& maxValue,
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	953 const ImageAccessor& image)
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	954 {
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	955 switch (image.GetFormat())
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	956 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	957 case PixelFormat_Float32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	958 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	959 assert(sizeof(float) == 4);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	960 float a, b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	961 GetMinMaxValueInternal<float>(a, b, image);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	962 minValue = a;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	963 maxValue = b;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	964 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	965 }
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	966
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	967 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	968 throw OrthancException(ErrorCode_NotImplemented);
2415 7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	969 }
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	970 }
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	971
7e217a1cc63f PixelFormat_Float32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	972
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	973
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	974 void ImageProcessing::AddConstant(ImageAccessor& image,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	975 int64_t value)
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	976 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	977 switch (image.GetFormat())
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	978 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	979 case PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	980 AddConstantInternal<uint8_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	981 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	982
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	983 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	984 AddConstantInternal<uint16_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	985 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	986
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	987 case PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	988 AddConstantInternal<int16_t>(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	989 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	990
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	991 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	992 throw OrthancException(ErrorCode_NotImplemented);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	993 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	994 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	995
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	996
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	997 void ImageProcessing::MultiplyConstant(ImageAccessor& image,
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	998 float factor,
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	999 bool useRound)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1000 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1001 switch (image.GetFormat())
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1002 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1003 case PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1004 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1005 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1006 MultiplyConstantInternal<uint8_t, true>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1007 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1008 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1009 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1010 MultiplyConstantInternal<uint8_t, false>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1011 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1012 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1013
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1014 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1015 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1016 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1017 MultiplyConstantInternal<uint16_t, true>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1018 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1019 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1020 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1021 MultiplyConstantInternal<uint16_t, false>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1022 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1023 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1024
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1025 case PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1026 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1027 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1028 MultiplyConstantInternal<int16_t, true>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1029 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1030 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1031 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1032 MultiplyConstantInternal<int16_t, false>(image, factor);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1033 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1034 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1035
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1036 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1037 throw OrthancException(ErrorCode_NotImplemented);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1038 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1039 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1040
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1041
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1042 void ImageProcessing::ShiftScale(ImageAccessor& image,
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1043 float offset,
2488 345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	1044 float scaling,
345725b9350c back to rounding to fix integration tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2487 diff changeset	1045 bool useRound)
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1046 {
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1047 switch (image.GetFormat())
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1048 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1049 case PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1050 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1051 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1052 ShiftScaleInternal<uint8_t, true>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1053 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1054 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1055 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1056 ShiftScaleInternal<uint8_t, false>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1057 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1058 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1059
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1060 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1061 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1062 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1063 ShiftScaleInternal<uint16_t, true>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1064 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1065 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1066 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1067 ShiftScaleInternal<uint16_t, false>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1068 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1069 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1070
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1071 case PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1072 if (useRound)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1073 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1074 ShiftScaleInternal<int16_t, true>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1075 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1076 else
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1077 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1078 ShiftScaleInternal<int16_t, false>(image, offset, scaling);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1079 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1080 return;
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1081
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1082 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1083 throw OrthancException(ErrorCode_NotImplemented);
863 3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1084 }
3c0d0836f704 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 862 diff changeset	1085 }
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1086
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1087
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1088 void ImageProcessing::Invert(ImageAccessor& image, int64_t maxValue)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1089 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1090 const unsigned int width = image.GetWidth();
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1091 const unsigned int height = image.GetHeight();
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1092
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1093 switch (image.GetFormat())
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1094 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1095 case PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1096 {
3234 3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1097 uint16_t maxValueUint16 = (uint16_t)(std::min(maxValue, static_cast<int64_t>(std::numeric_limits<uint16_t>::max())));
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1098
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1099 for (unsigned int y = 0; y < height; y++)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1100 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1101 uint16_t* p = reinterpret_cast<uint16_t*>(image.GetRow(y));
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1102
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1103 for (unsigned int x = 0; x < width; x++, p++)
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1104 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1105 p = maxValueUint16 - (p);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1106 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1107 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1108
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1109 return;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1110 }
3234 3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1111 case PixelFormat_Grayscale8:
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1112 {
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1113 uint8_t maxValueUint8 = (uint8_t)(std::min(maxValue, static_cast<int64_t>(std::numeric_limits<uint8_t>::max())));
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1114
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1115 for (unsigned int y = 0; y < height; y++)
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1116 {
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1117 uint8_t* p = reinterpret_cast<uint8_t*>(image.GetRow(y));
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1118
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1119 for (unsigned int x = 0; x < width; x++, p++)
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1120 {
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1121 p = maxValueUint8 - (p);
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1122 }
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1123 }
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1124
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1125 return;
3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1126 }
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1127
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1128 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1129 throw OrthancException(ErrorCode_NotImplemented);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1130 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1131
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1132 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1133
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1134 void ImageProcessing::Invert(ImageAccessor& image)
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1135 {
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1136 switch (image.GetFormat())
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1137 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1138 case PixelFormat_Grayscale8:
3234 3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1139 return Invert(image, 255);
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1140 default:
3234 3ca924140de6 merged ImageProcessing::Invert implementations am@osimis.io parents: 3227 diff changeset	1141 throw OrthancException(ErrorCode_NotImplemented); // you should use the Invert(image, maxValue) overload
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1142 }
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2252 diff changeset	1143 }
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1144
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1145
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1146
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1147 namespace
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1148 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1149 template <Orthanc::PixelFormat Format>
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1150 class BresenhamPixelWriter
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1151 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1152 private:
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1153 typedef typename PixelTraits<Format>::PixelType PixelType;
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1154
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1155 Orthanc::ImageAccessor& image_;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1156 PixelType value_;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1157
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1158 void PlotLineLow(int x0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1159 int y0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1160 int x1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1161 int y1)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1162 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1163 int dx = x1 - x0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1164 int dy = y1 - y0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1165 int yi = 1;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1166
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1167 if (dy < 0)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1168 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1169 yi = -1;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1170 dy = -dy;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1171 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1172
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1173 int d = 2 * dy - dx;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1174 int y = y0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1175
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1176 for (int x = x0; x <= x1; x++)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1177 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1178 Write(x, y);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1179
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1180 if (d > 0)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1181 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1182 y = y + yi;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1183 d = d - 2 * dx;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1184 }
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1185
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1186 d = d + 2*dy;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1187 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1188 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1189
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1190 void PlotLineHigh(int x0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1191 int y0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1192 int x1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1193 int y1)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1194 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1195 int dx = x1 - x0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1196 int dy = y1 - y0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1197 int xi = 1;
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1198
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1199 if (dx < 0)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1200 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1201 xi = -1;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1202 dx = -dx;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1203 }
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1204
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1205 int d = 2 * dx - dy;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1206 int x = x0;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1207
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1208 for (int y = y0; y <= y1; y++)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1209 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1210 Write(x, y);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1211
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1212 if (d > 0)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1213 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1214 x = x + xi;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1215 d = d - 2 * dy;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1216 }
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1217
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1218 d = d + 2 * dx;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1219 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1220 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1221
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1222 public:
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1223 BresenhamPixelWriter(Orthanc::ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1224 int64_t value) :
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1225 image_(image),
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1226 value_(PixelTraits<Format>::IntegerToPixel(value))
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1227 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1228 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1229
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1230 BresenhamPixelWriter(Orthanc::ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1231 const PixelType& value) :
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1232 image_(image),
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1233 value_(value)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1234 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1235 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1236
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1237 void Write(int x,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1238 int y)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1239 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1240 if (x >= 0 &&
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1241 y >= 0 &&
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1242 static_cast<unsigned int>(x) < image_.GetWidth() &&
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1243 static_cast<unsigned int>(y) < image_.GetHeight())
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1244 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1245 PixelType* p = reinterpret_cast<PixelType*>(image_.GetRow(y));
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1246 p[x] = value_;
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1247 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1248 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1249
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1250 void DrawSegment(int x0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1251 int y0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1252 int x1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1253 int y1)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1254 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1255 // This is an implementation of Bresenham's line algorithm
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1256 // https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm#All_cases
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1257
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1258 if (abs(y1 - y0) < abs(x1 - x0))
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1259 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1260 if (x0 > x1)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1261 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1262 PlotLineLow(x1, y1, x0, y0);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1263 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1264 else
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1265 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1266 PlotLineLow(x0, y0, x1, y1);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1267 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1268 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1269 else
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1270 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1271 if (y0 > y1)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1272 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1273 PlotLineHigh(x1, y1, x0, y0);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1274 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1275 else
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1276 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1277 PlotLineHigh(x0, y0, x1, y1);
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1278 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1279 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1280 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1281 };
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1282 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1283
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1284
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1285 void ImageProcessing::DrawLineSegment(ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1286 int x0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1287 int y0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1288 int x1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1289 int y1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1290 int64_t value)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1291 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1292 switch (image.GetFormat())
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1293 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1294 case Orthanc::PixelFormat_Grayscale8:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1295 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1296 BresenhamPixelWriter<Orthanc::PixelFormat_Grayscale8> writer(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1297 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1298 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1299 }
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1300
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1301 case Orthanc::PixelFormat_Grayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1302 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1303 BresenhamPixelWriter<Orthanc::PixelFormat_Grayscale16> writer(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1304 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1305 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1306 }
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1307
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1308 case Orthanc::PixelFormat_SignedGrayscale16:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1309 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1310 BresenhamPixelWriter<Orthanc::PixelFormat_SignedGrayscale16> writer(image, value);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1311 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1312 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1313 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1314
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1315 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1316 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1317 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1318 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1319
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1320
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1321 void ImageProcessing::DrawLineSegment(ImageAccessor& image,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1322 int x0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1323 int y0,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1324 int x1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1325 int y1,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1326 uint8_t red,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1327 uint8_t green,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1328 uint8_t blue,
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1329 uint8_t alpha)
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1330 {
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1331 switch (image.GetFormat())
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1332 {
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1333 case Orthanc::PixelFormat_BGRA32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1334 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1335 PixelTraits<Orthanc::PixelFormat_BGRA32>::PixelType pixel;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1336 pixel.red_ = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1337 pixel.green_ = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1338 pixel.blue_ = blue;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1339 pixel.alpha_ = alpha;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1340
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1341 BresenhamPixelWriter<Orthanc::PixelFormat_BGRA32> writer(image, pixel);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1342 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1343 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1344 }
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1345
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1346 case Orthanc::PixelFormat_RGBA32:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1347 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1348 PixelTraits<Orthanc::PixelFormat_RGBA32>::PixelType pixel;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1349 pixel.red_ = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1350 pixel.green_ = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1351 pixel.blue_ = blue;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1352 pixel.alpha_ = alpha;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1353
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1354 BresenhamPixelWriter<Orthanc::PixelFormat_RGBA32> writer(image, pixel);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1355 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1356 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1357 }
2783 65699fcb4e99 PixelTraits<PixelFormat_RGBA32> Sebastien Jodogne <s.jodogne@gmail.com> parents: 2650 diff changeset	1358
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1359 case Orthanc::PixelFormat_RGB24:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1360 {
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1361 PixelTraits<Orthanc::PixelFormat_RGB24>::PixelType pixel;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1362 pixel.red_ = red;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1363 pixel.green_ = green;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1364 pixel.blue_ = blue;
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1365
3227 53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1366 BresenhamPixelWriter<Orthanc::PixelFormat_RGB24> writer(image, pixel);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1367 writer.DrawSegment(x0, y0, x1, y1);
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1368 break;
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1369 }
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1370
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1371 default:
53bb1f4b3844 added Invert for Grayscale16 am@osimis.io parents: 3060 diff changeset	1372 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
2489 e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1373 }
e91bab2d8c75 Bresenham's line algorithm Sebastien Jodogne <s.jodogne@gmail.com> parents: 2488 diff changeset	1374 }
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1375
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1376 void ComputePolygonExtent(int32_t& left, int32_t& right, int32_t& top, int32_t& bottom, const std::vector<ImageProcessing::ImagePoint>& points)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1377 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1378 left = std::numeric_limits<int32_t>::max();
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1379 right = std::numeric_limits<int32_t>::min();
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1380 top = std::numeric_limits<int32_t>::max();
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1381 bottom = std::numeric_limits<int32_t>::min();
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1382
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1383 for (size_t i = 0; i < points.size(); i++)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1384 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1385 const ImageProcessing::ImagePoint& p = points[i];
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1386 left = std::min(p.GetX(), left);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1387 right = std::max(p.GetX(), right);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1388 bottom = std::max(p.GetY(), bottom);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1389 top = std::min(p.GetY(), top);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1390 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1391 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1392
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1393 template <PixelFormat TargetFormat>
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1394 void FillPolygon_(ImageAccessor& image,
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1395 const std::vector<ImageProcessing::ImagePoint>& points,
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1396 int64_t value_)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1397 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1398 typedef typename PixelTraits<TargetFormat>::PixelType TargetType;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1399
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1400 TargetType value = PixelTraits<TargetFormat>::IntegerToPixel(value_);
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1401 int imageWidth = static_cast<int>(image.GetWidth());
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1402 int imageHeight = static_cast<int>(image.GetHeight());
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1403 int32_t left;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1404 int32_t right;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1405 int32_t top;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1406 int32_t bottom;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1407
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1408 // TODO: test clipping in UT (in Trello board)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1409 ComputePolygonExtent(left, right, top, bottom, points);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1410
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1411 // clip the computed extent with the target image
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1412 // L and R
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1413 left = std::max(0, left);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1414 left = std::min(imageWidth, left);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1415 right = std::max(0, right);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1416 right = std::min(imageWidth, right);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1417 if (left > right)
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1418 std::swap(left, right);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1419
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1420 // T and B
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1421 top = std::max(0, top);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1422 top = std::min(imageHeight, top);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1423 bottom = std::max(0, bottom);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1424 bottom = std::min(imageHeight, bottom);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1425 if (top > bottom)
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1426 std::swap(top, bottom);
a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1427
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1428 // from http://alienryderflex.com/polygon_fill/
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1429
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1430 // convert all "corner" points to double only once
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1431 std::vector<double> cpx;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1432 std::vector<double> cpy;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1433 size_t cpSize = points.size();
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1434 for (size_t i = 0; i < points.size(); i++)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1435 {
3365 9345710bbf12 check limits in fillpolygon Alain Mazy <alain@mazy.be> parents: 3323 diff changeset	1436 if (points[i].GetX() < 0 \|\| points[i].GetX() >= imageWidth
9345710bbf12 check limits in fillpolygon Alain Mazy <alain@mazy.be> parents: 3323 diff changeset	1437 \|\| points[i].GetY() < 0 \|\| points[i].GetY() >= imageHeight)
9345710bbf12 check limits in fillpolygon Alain Mazy <alain@mazy.be> parents: 3323 diff changeset	1438 {
9345710bbf12 check limits in fillpolygon Alain Mazy <alain@mazy.be> parents: 3323 diff changeset	1439 throw Orthanc::OrthancException(ErrorCode_ParameterOutOfRange);
9345710bbf12 check limits in fillpolygon Alain Mazy <alain@mazy.be> parents: 3323 diff changeset	1440 }
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1441 cpx.push_back((double)points[i].GetX());
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1442 cpy.push_back((double)points[i].GetY());
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1443 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1444
3431 e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1445 // Draw the lines segments
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1446 for (size_t i = 0; i < (points.size() -1); i++)
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1447 {
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1448 ImageProcessing::DrawLineSegment(image, points[i].GetX(), points[i].GetY(), points[i+1].GetX(), points[i+1].GetY(), value_);
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1449 }
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1450 ImageProcessing::DrawLineSegment(image, points[points.size() -1].GetX(), points[points.size() -1].GetY(), points[0].GetX(), points[0].GetY(), value_);
e0841192d7d0 improved FillPolygon Alain Mazy <alain@mazy.be> parents: 3365 diff changeset	1451
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1452 std::vector<int32_t> nodeX;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1453 nodeX.resize(cpSize);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1454 int nodes, pixelX, pixelY, i, j, swap ;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1455
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1456 // Loop through the rows of the image.
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1457 for (pixelY = top; pixelY < bottom; pixelY++)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1458 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1459 double y = (double)pixelY;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1460 // Build a list of nodes.
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1461 nodes = 0;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1462 j = static_cast<int>(cpSize) - 1;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1463
3259 6f9398eb902d unit test Toolbox.SubstituteVariables Sebastien Jodogne <s.jodogne@gmail.com> parents: 3258 diff changeset	1464 for (i = 0; i < static_cast<int>(cpSize); i++)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1465 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1466 if ((cpy[i] < y && cpy[j] >= y) \|\| (cpy[j] < y && cpy[i] >= y))
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1467 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1468 nodeX[nodes++] = (int32_t)(cpx[i] + (y - cpy[i])/(cpy[j] - cpy[i]) * (cpx[j] - cpx[i]));
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1469 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1470 j=i;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1471 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1472
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1473 // Sort the nodes, via a simple “Bubble” sort.
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1474 i=0;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1475 while (i < nodes-1)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1476 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1477 if (nodeX[i] > nodeX[i+1])
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1478 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1479 swap = nodeX[i];
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1480 nodeX[i] = nodeX[i+1];
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1481 nodeX[i+1] = swap;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1482 if (i > 0)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1483 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1484 i--;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1485 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1486 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1487 else
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1488 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1489 i++;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1490 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1491 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1492
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1493 TargetType* row = reinterpret_cast<TargetType*>(image.GetRow(pixelY));
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1494 // Fill the pixels between node pairs.
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1495 for (i = 0; i < nodes; i += 2)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1496 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1497 if (nodeX[i] >= right)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1498 break;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1499
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1500 if (nodeX[i + 1] >= left)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1501 {
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1502 if (nodeX[i] < left)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1503 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1504 nodeX[i] = left;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1505 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1506
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1507 if (nodeX[i + 1] > right)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1508 {
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1509 nodeX[i + 1] = right;
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1510 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1511
3323 a15a4b9d8c00 Added image clipping to <T> FillPolygon_ to prevent out-of-memory access Benjamin Golinvaux <bgo@osimis.io> parents: 3265 diff changeset	1512 for (pixelX = nodeX[i]; pixelX <= nodeX[i + 1]; pixelX++)
3258 6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1513 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1514 *(row + pixelX) = value;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1515 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1516 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1517 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1518 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1519 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1520
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1521 void ImageProcessing::FillPolygon(ImageAccessor& image,
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1522 const std::vector<ImagePoint>& points,
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1523 int64_t value)
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1524 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1525 switch (image.GetFormat())
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1526 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1527 case Orthanc::PixelFormat_Grayscale8:
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1528 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1529 FillPolygon_<Orthanc::PixelFormat_Grayscale8>(image, points, value);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1530 break;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1531 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1532 case Orthanc::PixelFormat_Grayscale16:
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1533 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1534 FillPolygon_<Orthanc::PixelFormat_Grayscale16>(image, points, value);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1535 break;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1536 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1537 case Orthanc::PixelFormat_SignedGrayscale16:
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1538 {
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1539 FillPolygon_<Orthanc::PixelFormat_SignedGrayscale16>(image, points, value);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1540 break;
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1541 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1542 default:
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1543 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1544 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1545 }
6f652c7bfc85 ImageProcessing::FillPolygon Alain Mazy <alain@mazy.be> parents: 3234 diff changeset	1546
853 839be3022203 DicomImageInformation Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1547 }

Mercurial > hg > orthanc

annotate Core/Images/ImageProcessing.cpp @ 3498:957e06cbe76a