Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix_non_virtual_destructor'

Browse Source 
a55596b38 Reorder member functions.
6fba7347a Mark pixel destructors as virtual to fix build error.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2091
This commit is contained in:
Nick 2020-05-14 20:26:04 +00:00 committed by Kitware Robot
commit f036ebd48f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/io/PixelTypes.h
View File

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