From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:22:34 +0100 Subject: projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures --- src/apps/gen_cheb.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/apps/gen_cheb.cpp') diff --git a/src/apps/gen_cheb.cpp b/src/apps/gen_cheb.cpp index 4ba514d4..167ee79d 100644 --- a/src/apps/gen_cheb.cpp +++ b/src/apps/gen_cheb.cpp @@ -1,5 +1,6 @@ /* generates 'T' option output */ #define PJ_LIB__ +#include "proj.h" #include "projects.h" #include #include @@ -38,17 +39,17 @@ static long strtol_type_safe(const char *s, const char ** endptr, int base) /* FIXME: put the declaration in a header. Also used in proj.c */ -void gen_cheb(int inverse, projUV (*proj)(projUV), const char *s, PJ *P, +void gen_cheb(int inverse, PJ_UV (*proj)(PJ_UV), const char *s, PJ *P, int iargc, char **iargv); extern void p_series(Tseries *, FILE *, char *); -void gen_cheb(int inverse, projUV (*proj)(projUV), const char *s, PJ *P, +void gen_cheb(int inverse, PJ_UV (*proj)(PJ_UV), const char *s, PJ *P, int iargc, char **iargv) { long NU = 15, NV = 15; int errin = 0, pwr; long res = -1; char *arg, fmt[32]; - projUV low, upp, resid; + PJ_UV low, upp, resid; Tseries *F; double (*input)(const char *, const char **); -- cgit v1.2.3 From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:58:26 +0100 Subject: Merge projects.h into proj_internal.h --- src/apps/gen_cheb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/apps/gen_cheb.cpp') diff --git a/src/apps/gen_cheb.cpp b/src/apps/gen_cheb.cpp index 167ee79d..23285314 100644 --- a/src/apps/gen_cheb.cpp +++ b/src/apps/gen_cheb.cpp @@ -1,7 +1,7 @@ /* generates 'T' option output */ #define PJ_LIB__ #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include #include #include -- cgit v1.2.3