From 77bb748369328b094fcb0142fafd74d9f9779128 Mon Sep 17 00:00:00 2001 From: Matthew Hasselfield Date: Fri, 17 Nov 2023 18:53:55 +0000 Subject: [PATCH] proj: last couple fixes for g++ compatibility --- src/Projection.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Projection.cxx b/src/Projection.cxx index e0fa057..f83b771 100644 --- a/src/Projection.cxx +++ b/src/Projection.cxx @@ -579,7 +579,7 @@ template class Pixelizor2_Flat { public: static const int index_count = 3; - static const int interp_count; + static const int interp_count = Interpol::interp_count; Pixelizor2_Flat() {}; Pixelizor2_Flat(int ny, int nx, double dy, double dx, double iy0, double ix0, int tiley, int tilex) { @@ -745,9 +745,6 @@ class Pixelizor2_Flat { // Take care of the parts that depend on the interpolation order. // First NearestNeighbor interpolation -template<> -const int Pixelizor2_Flat::interp_count = 1; - template<> inline int Pixelizor2_Flat::GetPixels(int i_det, int i_time, const double *coords, int pixinds[interp_count][index_count], FSIGNAL pixweights[interp_count]) { int ix = int(coords[0] / parent_pix.cdelt[1] + parent_pix.crpix[1] - 1 + 0.5); @@ -765,9 +762,6 @@ inline int Pixelizor2_Flat::GetPixels(int i_det, int i_t } // Then Bilinear interpolation -template<> -const int Pixelizor2_Flat::interp_count = 4; - template<> inline int Pixelizor2_Flat::GetPixels(int i_det, int i_time, const double *coords, int pixinds[interp_count][index_count], FSIGNAL pixweights[interp_count]) { // For bilinear mapmaking we need to visit the four bounding pixels