diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-25 01:02:23 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-25 01:02:23 +0000 |
| commit | 9623a726ca936404540ea64cd57315ededb6726b (patch) | |
| tree | 2bb181b8854f087c90e84088043280d79a5306dd /src | |
| parent | 8c32bc5177d5522f1e2f1cc23ef9be97c347e2e5 (diff) | |
| download | PROJ-9623a726ca936404540ea64cd57315ededb6726b.tar.gz PROJ-9623a726ca936404540ea64cd57315ededb6726b.zip | |
move pj_open_lib() to public include file
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2356 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/proj_api.h | 14 | ||||
| -rw-r--r-- | src/projects.h | 9 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/proj_api.h b/src/proj_api.h index 236207e5..d93e4059 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -130,11 +130,21 @@ void *pj_ctx_get_app_data( projCtx ); void pj_ctx_set_fileapi( projCtx, projFileAPI *); projFileAPI *pj_ctx_get_fileapi( projCtx ); -projFileAPI *pj_get_default_fileapi(); - void pj_log( projCtx ctx, int level, const char *fmt, ... ); void pj_stderr_logger( void *, int, const char * ); +/* file api */ +projFileAPI *pj_get_default_fileapi(); + +PAFile pj_ctx_fopen(projCtx ctx, const char *filename, const char *access); +size_t pj_ctx_fread(projCtx ctx, void *buffer, size_t size, size_t nmemb, PAFile file); +int pj_ctx_fseek(projCtx ctx, PAFile file, long offset, int whence); +long pj_ctx_ftell(projCtx ctx, PAFile file); +void pj_ctx_fclose(projCtx ctx, PAFile file); +char *pj_ctx_fgets(projCtx ctx, char *line, int size, PAFile file); + +PAFile pj_open_lib(projCtx, char *, char *); + #define PJ_LOG_NONE 0 #define PJ_LOG_ERROR 1 #define PJ_LOG_DEBUG_MAJOR 2 diff --git a/src/projects.h b/src/projects.h index a11940ab..5a9519c5 100644 --- a/src/projects.h +++ b/src/projects.h @@ -390,14 +390,6 @@ typedef struct _PJ_GridCatalog { } PJ_GridCatalog; -/* file api */ -PAFile pj_ctx_fopen(projCtx ctx, const char *filename, const char *access); -size_t pj_ctx_fread(projCtx ctx, void *buffer, size_t size, size_t nmemb, PAFile file); -int pj_ctx_fseek(projCtx ctx, PAFile file, long offset, int whence); -long pj_ctx_ftell(projCtx ctx, PAFile file); -void pj_ctx_fclose(projCtx ctx, PAFile file); -char *pj_ctx_fgets(projCtx ctx, char *line, int size, PAFile file); - /* procedure prototypes */ double dmstor(const char *, char **); double dmstor_ctx(projCtx ctx, const char *, char **); @@ -428,7 +420,6 @@ double *pj_authset(double); double pj_authlat(double, double *); COMPLEX pj_zpoly1(COMPLEX, COMPLEX *, int); COMPLEX pj_zpolyd1(COMPLEX, COMPLEX *, int, COMPLEX *); -PAFile pj_open_lib(projCtx, char *, char *); int pj_deriv(LP, double, PJ *, struct DERIVS *); int pj_factors(LP, PJ *, double, struct FACTORS *); |