Mercurial > hg > orthanc
diff OrthancFramework/Sources/Images/ImageProcessing.h @ 4056:55727d85f419 framework
fix for msvc2008
author | s.jodogne@gmail.com |
---|---|
date | Thu, 11 Jun 2020 13:46:57 +0200 |
parents | d25f4c0fa160 |
children | d6362b2c4b61 |
line wrap: on
line diff
--- a/OrthancFramework/Sources/Images/ImageProcessing.h Thu Jun 11 12:52:09 2020 +0200 +++ b/OrthancFramework/Sources/Images/ImageProcessing.h Thu Jun 11 13:46:57 2020 +0200 @@ -36,10 +36,9 @@ #include "../OrthancFramework.h" #include "ImageAccessor.h" + #include <vector> - #include <stdint.h> -#include <algorithm> #include <boost/noncopyable.hpp> namespace Orthanc @@ -47,21 +46,28 @@ class ORTHANC_PUBLIC ImageProcessing : public boost::noncopyable { public: - class ImagePoint + class ORTHANC_PUBLIC ImagePoint { int32_t x_; int32_t y_; public: - ImagePoint(int32_t x, int32_t y) - : x_(x), - y_(y) + ImagePoint(int32_t x, + int32_t y) : + x_(x), + y_(y) { } - int32_t GetX() const {return x_;} + int32_t GetX() const + { + return x_; + } - int32_t GetY() const {return y_;} + int32_t GetY() const + { + return y_; + } void Set(int32_t x, int32_t y) { @@ -69,11 +75,7 @@ y_ = y; } - void ClipTo(int32_t minX, int32_t maxX, int32_t minY, int32_t maxY) - { - x_ = std::max(minX, std::min(maxX, x_)); - y_ = std::max(minY, std::min(maxY, y_)); - } + void ClipTo(int32_t minX, int32_t maxX, int32_t minY, int32_t maxY); double GetDistanceTo(const ImagePoint& other) const;