diff --git a/vskernels/kernels/spline.py b/vskernels/kernels/spline.py index 9bbbff8..6d9cf38 100644 --- a/vskernels/kernels/spline.py +++ b/vskernels/kernels/spline.py @@ -12,10 +12,6 @@ 'Spline16', 'Spline36', 'Spline64', - 'Spline100', - 'Spline144', - 'Spline196', - 'Spline256', ] @@ -65,31 +61,3 @@ class Spline64(ComplexKernel): scale_function = resample_function = core.lazy.resize.Spline64 descale_function = core.lazy.descale.Despline64 - - -class Spline100(Spline): - """fmtconv's spline kernel with taps=5.""" - - def __init__(self, **kwargs: Any) -> None: - super().__init__(taps=5, **kwargs) - - -class Spline144(Spline): - """fmtconv's spline kernel with taps=6.""" - - def __init__(self, **kwargs: Any) -> None: - super().__init__(taps=6, **kwargs) - - -class Spline196(Spline): - """fmtconv's spline kernel with taps=7.""" - - def __init__(self, **kwargs: Any) -> None: - super().__init__(taps=7, **kwargs) - - -class Spline256(Spline): - """fmtconv's spline kernel with taps=8.""" - - def __init__(self, **kwargs: Any) -> None: - super().__init__(taps=8, **kwargs) diff --git a/vskernels/kernels/various.py b/vskernels/kernels/various.py index 7215aa6..de134a1 100644 --- a/vskernels/kernels/various.py +++ b/vskernels/kernels/various.py @@ -11,9 +11,7 @@ 'BlackManMinLobe', 'Sinc', 'Gaussian', - 'NearestNeighbour', 'EwaBicubic', - 'EwaJinc', 'EwaLanczos', 'EwaGinseng', 'EwaHann', @@ -52,22 +50,15 @@ class Gaussian(FmtConv): _kernel = 'gaussian' - def __init__(self, curve: int = 30, **kwargs: Any) -> None: + def __init__(self, curve: float = 30, **kwargs: Any) -> None: super().__init__(a1=curve, **kwargs) -class NearestNeighbour(Gaussian): - """Nearest Neighbour kernel.""" - - def __init__(self, **kwargs: Any) -> None: - super().__init__(100, **kwargs) - - class EwaBicubic(Placebo): _kernel = 'ewa_robidoux' def __init__(self, b: float = 0.0, c: float = 0.5, radius: int | None = None, **kwargs: Any) -> None: - radius = kwargs.pop('taps', None) + radius = kwargs.pop('taps', radius) if radius is None: radius = 1 if (b, c) == (0, 0) else 2 @@ -82,13 +73,6 @@ def __init__(self, taps: float = 3.2383154841662362076499, **kwargs: Any) -> Non super().__init__(taps, None, None, **kwargs) -class EwaJinc(EwaLanczos): - def __init__(self, taps: float = 3.2383154841662362076499, **kwargs: Any) -> None: - print(DeprecationWarning('EwaJinc is deprecated! Switch over to EwaLanczos.')) - - super().__init__(taps, None, None, **kwargs) - - class EwaGinseng(Placebo): _kernel = 'ewa_ginseng'