Skip to content

HYRAX-2076: I modified gctp(). It now has many const params. #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jgallagher59701 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

HYRAX-2076: I modified gctp(). It now has many const params. #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/jhrg/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"${workspaceFolder}/standalone/**",
"${workspaceFolder}/xmlcommand/**",
"${workspaceFolder}/modules/**",
"${workspaceFolder}/modules/hdf5_handler/gtcp/include/**"
],
"C_Cpp.default.cppStandard": "c++14",
"C_Cpp.default.intelliSenseMode": "macos-clang-arm64",
Expand Down
2 changes: 1 addition & 1 deletion modules/hdf5_handler/gctp/include/gctp_prototypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ long untfz(long inunit, long outunit, double *factor);
int init(long ipr, long jpr, char *efile, char *pfile);
void close_file(void);
int hinv_init(int insys, int inzone, double *inparm, int indatum, char *fn27, char *fn83, int *iflg, int (*hinv_trans[])(double, double, double*, double*));
int gctp(double *incoor, long *insys, long *inzone, double *inparm, long *inunit, long *indatum, long *ipr, char *efile, long *jpr, char *pfile, double *outcoor, long *outsys, long *outzone, double *outparm, long *outunit, long *outdatum, char *fn27, char *fn83, long *iflg);
int gctp(const double *incoor, const long *insys, const long *inzone, double *inparm, long *inunit, const long *indatum, const long *ipr, char *efile, const long *jpr, char *pfile, double *outcoor, const long *outsys, const long *outzone, double *outparm, long *outunit, const long *outdatum, char *fn27, char *fn83, long *iflg);
int gctp_(double *incoor, long *insys, long *inzone, double *inparm, long *inunit, long *indatum, long *ipr, char *efile, long *jpr, char *pfile, double *outcoor, long *outsys, long *outzone, double *outparm, long *outunit, long *outdatum, char *fn27, char *fn83, long *iflg);

#endif
Expand Down
27 changes: 12 additions & 15 deletions modules/hdf5_handler/gctp/src/gctp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ ALGORITHM REFERENCES
#define TRUE 1
#define FALSE 0

double pakr2dm(double ang); /* defined in cproj.c jhrg 3/31/26*/

static long iter = 0; /* First time flag */
static long inpj[MAXPROJ + 1]; /* input projection array */
static long indat[MAXPROJ + 1]; /* input dataum array */
Expand Down Expand Up @@ -71,31 +73,26 @@ static long NAD83[134] = {101,102,5010,5300,201,202,203,301,302,401,402,403,
*/

/* Added explicit return type. 6/5/23 */
#if 0
int
gctp(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,outcoor,
outsys,outzone,outparm,outunit,outdatum,fn27,fn83,iflg)
#endif
int
gctp(
double *incoor, /* input coordinates */
long *insys, /* input projection code */
long *inzone, /* input zone number */
const double *incoor, /* input coordinates */
const long *insys, /* input projection code */
const long *inzone, /* input zone number */
double *inparm, /* input projection parameter array */
long *inunit, /* input units */
long *indatum, /* input datum */
long *ipr, /* printout flag for error messages. 0=screen, 1=file,
const long *indatum, /* input datum */
const long *ipr, /* printout flag for error messages. 0=screen, 1=file,
2=both*/
char *efile, /* error file name */
long *jpr, /* printout flag for projection parameters 0=screen,
const long *jpr, /* printout flag for projection parameters 0=screen,
1=file, 2 = both*/
char *pfile, /* error file name */
double *outcoor, /* output coordinates */
long *outsys, /* output projection code */
long *outzone, /* output zone */
const long *outsys, /* output projection code */
const long *outzone, /* output zone */
double *outparm, /* output projection array */
long *outunit, /* output units */
long *outdatum, /* output datum */
const long *outdatum, /* output datum */
char fn27[], /* file name of NAD 1927 parameter file */
char fn83[], /* file name of NAD 1983 parameter file */
long *iflg) /* error flag */
Expand All @@ -106,7 +103,7 @@ double factor; /* conversion factor */
double lon; /* longitude */
double lat; /* latitude */
/*double temp; */ /* dummy variable */
double pakr2dm(double ang);
/* double pakr2dm(double ang); move declaration to top of file jhrg 3/31/26 */
long i,j; /* loop counters */
long ininit_flag; /* input initilization flag */
long outinit_flag; /* output initilization flag */
Expand Down