Merge branch 'master' into deprecate_read_portal_get

This commit is contained in:
Nick 2020-05-14 16:26:49 -04:00
commit f1ee3f51f1

@ -88,6 +88,8 @@ public:
ConstructPixelFromImage(imageData, index);
}
virtual ~BasePixel() = default;
/// Calculates this difference between two pixels as a single value.
///
virtual ComponentType Diff(const BaseType& pixel) const = 0;
@ -141,6 +143,8 @@ public:
{
}
virtual ~RGBPixel() = default;
ComponentType Diff(const Superclass& pixel) const override;
vtkm::Vec4f_32 ToVec4f() const override;
@ -176,6 +180,8 @@ public:
{
}
virtual ~GreyPixel() = default;
ComponentType Diff(const Superclass& pixel) const override;
vtkm::Vec4f_32 ToVec4f() const override;