From 7aca4d084091e8574d98c0d89913721f7a55749b Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 22 Aug 2024 11:42:46 +0100
Subject: [PATCH] ENH: Adjust logic so that Splinterpolator can be created with
pre-calculated coefficeints
---
splinterpolator.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/splinterpolator.h b/splinterpolator.h
index fbd7b4f..e7c43cf 100644
--- a/splinterpolator.h
+++ b/splinterpolator.h
@@ -1431,16 +1431,19 @@ void Splinterpolator<T>::assign(const Splinterpolator<T>& src)
template<class T>
bool Splinterpolator<T>::calc_coef(const T *data_or_coefs, bool copy, bool data_are_coefs)
{
- if (_order < 2 && !copy) { _cptr = data_or_coefs; return(false); }
+ // No copy, and nearest/interp, or pre-calculated
+ // coefficients - just take a pointer to the data
+ if (_order < 2 && !copy) { _cptr = data_or_coefs; return(false); }
+ if (data_are_coefs && !copy) { _cptr = data_or_coefs; return(false); }
// Allocate memory and put the original data into _coef
- //
unsigned int ts=1;
for (unsigned int i=0; i<_dim.size(); i++) ts *= _dim[i];
_coef = new T[ts];
memcpy(_coef,data_or_coefs,ts*sizeof(T));
- if (_order < 2) return(true); // If nearest neighbour or linear, that's all we need
+ if (_order < 2) return(true); // If nearest neighbour or linear, that's all we need
+ if (data_are_coefs) return(true); // User has given us pre-calculated coefficients
// Loop over all non-singleton dimensions and deconvolve along them
//
--
GitLab