Commit c5c248ba authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot

Merge topic 'reduce-masters-version-number' into paraview/release

8a00b357 set new deprecations to masters new name
b703d78b reduce VTK's version number
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !4700
parents 2982078d 8a00b357
# VTK version number components.
set(VTK_MAJOR_VERSION 9)
set(VTK_MINOR_VERSION 0)
set(VTK_MAJOR_VERSION 8)
set(VTK_MINOR_VERSION 2)
set(VTK_BUILD_VERSION 0)
......@@ -2534,14 +2534,14 @@ void vtkMath::RGBToHSV(float r, float g, float b,
#ifndef VTK_LEGACY_REMOVE
double* vtkMath::RGBToHSV(const double rgb[3])
{
VTK_LEGACY_BODY(vtkMath::RGBToHSV, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::RGBToHSV, "VTK 8.2");
return vtkMath::RGBToHSV(rgb[0], rgb[1], rgb[2]);
}
//----------------------------------------------------------------------------
double* vtkMath::RGBToHSV(double r, double g, double b)
{
VTK_LEGACY_BODY(vtkMath::RGBToHSV, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::RGBToHSV, "VTK 8.2");
static double hsv[3];
vtkMath::RGBToHSV(r, g, b, hsv, hsv + 1, hsv + 2);
return hsv;
......@@ -2624,14 +2624,14 @@ void vtkMath::HSVToRGB(float h, float s, float v,
#ifndef VTK_LEGACY_REMOVE
double* vtkMath::HSVToRGB(const double hsv[3])
{
VTK_LEGACY_BODY(vtkMath::HSVToRGB, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::HSVToRGB, "VTK 8.2");
return vtkMath::HSVToRGB(hsv[0], hsv[1], hsv[2]);
}
//----------------------------------------------------------------------------
double* vtkMath::HSVToRGB(double h, double s, double v)
{
VTK_LEGACY_BODY(vtkMath::HSVToRGB, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::HSVToRGB, "VTK 8.2");
static double rgb[3];
vtkMath::HSVToRGB(h, s, v, rgb, rgb + 1, rgb + 2);
return rgb;
......@@ -2724,7 +2724,7 @@ void vtkMath::LabToXYZ(double L, double a, double b,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::LabToXYZ(const double lab[3])
{
VTK_LEGACY_BODY(vtkMath::LabToXYZ, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::LabToXYZ, "VTK 8.2");
static double xyz[3];
vtkMath::LabToXYZ(lab[0], lab[1], lab[2], xyz+0, xyz+1, xyz+2);
return xyz;
......@@ -2758,7 +2758,7 @@ void vtkMath::XYZToLab(double x, double y, double z,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::XYZToLab(const double xyz[3])
{
VTK_LEGACY_BODY(vtkMath::XYZToLab, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::XYZToLab, "VTK 8.2");
static double lab[3];
vtkMath::XYZToLab(xyz[0], xyz[1], xyz[2], lab+0, lab+1, lab+2);
return lab;
......@@ -2814,7 +2814,7 @@ void vtkMath::XYZToRGB(double x, double y, double z,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::XYZToRGB(const double xyz[3])
{
VTK_LEGACY_BODY(vtkMath::XYZToRGB, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::XYZToRGB, "VTK 8.2");
static double rgb[3];
vtkMath::XYZToRGB(xyz[0], xyz[1], xyz[2], rgb+0, rgb+1, rgb+2);
return rgb;
......@@ -2850,7 +2850,7 @@ void vtkMath::RGBToXYZ(double r, double g, double b,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::RGBToXYZ(const double rgb[3])
{
VTK_LEGACY_BODY(vtkMath::RGBToXYZ, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::RGBToXYZ, "VTK 8.2");
static double xyz[3];
vtkMath::RGBToXYZ(rgb[0], rgb[1], rgb[2], xyz+0, xyz+1, xyz+2);
return xyz;
......@@ -2870,7 +2870,7 @@ void vtkMath::RGBToLab(double red, double green, double blue,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::RGBToLab(const double rgb[3])
{
VTK_LEGACY_BODY(vtkMath::RGBToLab, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::RGBToLab, "VTK 8.2");
double x, y, z;
vtkMath::RGBToXYZ(rgb[0], rgb[1], rgb[2], &x, &y, &z);
......@@ -2895,7 +2895,7 @@ void vtkMath::LabToRGB(double L, double a, double b,
#ifndef VTK_LEGACY_REMOVE
double *vtkMath::LabToRGB(const double lab[3])
{
VTK_LEGACY_BODY(vtkMath::LabToRGB, "VTK 9.0");
VTK_LEGACY_BODY(vtkMath::LabToRGB, "VTK 8.2");
double x, y, z;
vtkMath::LabToXYZ(lab[0], lab[1], lab[2], &x, &y, &z);
......
......@@ -624,49 +624,49 @@ void vtkExtractSelection::PrintSelf(ostream& os, vtkIndent indent)
//----------------------------------------------------------------------------
void vtkExtractSelection::SetShowBounds(bool)
{
VTK_LEGACY_BODY(vtkExtractSelection::SetShowBounds, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::SetShowBounds, "VTK 8.2");
}
//----------------------------------------------------------------------------
bool vtkExtractSelection::GetShowBounds()
{
VTK_LEGACY_BODY(vtkExtractSelection::GetShowBounds, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::GetShowBounds, "VTK 8.2");
return false;
}
//----------------------------------------------------------------------------
void vtkExtractSelection::ShowBoundsOn()
{
VTK_LEGACY_BODY(vtkExtractSelection::ShowBoundsOn, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::ShowBoundsOn, "VTK 8.2");
}
//----------------------------------------------------------------------------
void vtkExtractSelection::ShowBoundsOff()
{
VTK_LEGACY_BODY(vtkExtractSelection::ShowBoundsOff, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::ShowBoundsOff, "VTK 8.2");
}
//----------------------------------------------------------------------------
void vtkExtractSelection::SetUseProbeForLocations(bool)
{
VTK_LEGACY_BODY(vtkExtractSelection::SetUseProbeForLocations, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::SetUseProbeForLocations, "VTK 8.2");
}
//----------------------------------------------------------------------------
bool vtkExtractSelection::GetUseProbeForLocations()
{
VTK_LEGACY_BODY(vtkExtractSelection::GetUseProbeForLocations, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::GetUseProbeForLocations, "VTK 8.2");
return false;
}
//----------------------------------------------------------------------------
void vtkExtractSelection::UseProbeForLocationsOn()
{
VTK_LEGACY_BODY(vtkExtractSelection::UseProbeForLocationsOn, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::UseProbeForLocationsOn, "VTK 8.2");
}
//----------------------------------------------------------------------------
void vtkExtractSelection::UseProbeForLocationsOff()
{
VTK_LEGACY_BODY(vtkExtractSelection::UseProbeForLocationsOff, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelection::UseProbeForLocationsOff, "VTK 8.2");
}
#endif
......@@ -40,7 +40,7 @@ vtkStandardNewMacro(vtkExtractSelectionLegacy);
//----------------------------------------------------------------------------
vtkExtractSelectionLegacy::vtkExtractSelectionLegacy()
{
VTK_LEGACY_BODY(vtkExtractSelectionLegacy::vtkExtractSelectionLegacy, "VTK 9.0");
VTK_LEGACY_BODY(vtkExtractSelectionLegacy::vtkExtractSelectionLegacy, "VTK 8.2");
this->BlockFilter = vtkExtractSelectedBlock::New();
this->IdsFilter = vtkExtractSelectedIds::New();
this->FrustumFilter = vtkExtractSelectedFrustum::New();
......
......@@ -25,7 +25,7 @@
* the extraction.
*
* This class used to be called vtkExtractSelection but it was replaced in
* VTK 9.0. This is only provided for backwards compatibility and is therefore
* VTK 8.2. This is only provided for backwards compatibility and is therefore
* deprecated.
*
* @sa
......
vtk_module(vtkUtilitiesEncodeString
LEGACY 9.0 "The module is no longer supported. Use the vtkEncodeString CMake module instead."
LEGACY 8.2 "The module is no longer supported. Use the vtkEncodeString CMake module instead."
EXCLUDE_FROM_WRAPPING)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment