diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-22 07:54:57 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-22 07:54:57 +0000 |
| commit | 44ef2bd6b0184d334b020e401026207b38aaa064 (patch) | |
| tree | 347b721fe196a12765ad5c869cb51e77fa3a64ec /src/nad_init.c | |
| parent | 07695742d49418f87338f0ffa48a16b9fae25767 (diff) | |
| download | PROJ-44ef2bd6b0184d334b020e401026207b38aaa064.tar.gz PROJ-44ef2bd6b0184d334b020e401026207b38aaa064.zip | |
bulk of file api implementation complete and working
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2345 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/nad_init.c')
| -rw-r--r-- | src/nad_init.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nad_init.c b/src/nad_init.c index bb62bd6f..84dc9867 100644 --- a/src/nad_init.c +++ b/src/nad_init.c @@ -82,18 +82,18 @@ static void swap_words( void *data_in, int word_size, int word_count ) /* Load the data portion of a ctable formatted grid. */ /************************************************************************/ -int nad_ctable_load( projCtx ctx, struct CTABLE *ct, FILE *fid ) +int nad_ctable_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) { int a_size; - fseek( fid, sizeof(struct CTABLE), SEEK_SET ); + pj_ctx_fseek( ctx, fid, sizeof(struct CTABLE), SEEK_SET ); /* read all the actual shift values */ a_size = ct->lim.lam * ct->lim.phi; ct->cvs = (FLP *) pj_malloc(sizeof(FLP) * a_size); if( ct->cvs == NULL - || fread(ct->cvs, sizeof(FLP), a_size, fid) != a_size ) + || pj_ctx_fread(ctx, ct->cvs, sizeof(FLP), a_size, fid) != a_size ) { pj_dalloc( ct->cvs ); ct->cvs = NULL; @@ -113,7 +113,7 @@ int nad_ctable_load( projCtx ctx, struct CTABLE *ct, FILE *fid ) /* Read the header portion of a "ctable" format grid. */ /************************************************************************/ -struct CTABLE *nad_ctable_init( projCtx ctx, FILE * fid ) +struct CTABLE *nad_ctable_init( projCtx ctx, PAFile fid ) { struct CTABLE *ct; int id_end; @@ -121,7 +121,7 @@ struct CTABLE *nad_ctable_init( projCtx ctx, FILE * fid ) /* read the table header */ ct = (struct CTABLE *) pj_malloc(sizeof(struct CTABLE)); if( ct == NULL - || fread( ct, sizeof(struct CTABLE), 1, fid ) != 1 ) + || pj_ctx_fread( ctx, ct, sizeof(struct CTABLE), 1, fid ) != 1 ) { pj_ctx_set_errno( ctx, -38 ); return NULL; @@ -155,18 +155,18 @@ struct CTABLE *nad_ctable_init( projCtx ctx, FILE * fid ) /* Load the data portion of a ctable2 formatted grid. */ /************************************************************************/ -int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, FILE *fid ) +int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) { int a_size; - fseek( fid, 160, SEEK_SET ); + pj_ctx_fseek( ctx, fid, 160, SEEK_SET ); /* read all the actual shift values */ a_size = ct->lim.lam * ct->lim.phi; ct->cvs = (FLP *) pj_malloc(sizeof(FLP) * a_size); if( ct->cvs == NULL - || fread(ct->cvs, sizeof(FLP), a_size, fid) != a_size ) + || pj_ctx_fread(ctx, ct->cvs, sizeof(FLP), a_size, fid) != a_size ) { pj_dalloc( ct->cvs ); ct->cvs = NULL; @@ -195,13 +195,13 @@ int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, FILE *fid ) /* Read the header portion of a "ctable2" format grid. */ /************************************************************************/ -struct CTABLE *nad_ctable2_init( projCtx ctx, FILE * fid ) +struct CTABLE *nad_ctable2_init( projCtx ctx, PAFile fid ) { struct CTABLE *ct; int id_end; char header[160]; - if( fread( header, sizeof(header), 1, fid ) != 1 ) + if( pj_ctx_fread( ctx, header, sizeof(header), 1, fid ) != 1 ) { pj_ctx_set_errno( ctx, -38 ); return NULL; @@ -268,7 +268,7 @@ struct CTABLE *nad_init(projCtx ctx, char *name) { char fname[MAX_PATH_FILENAME+1]; struct CTABLE *ct; - FILE *fid; + PAFile fid; ctx->last_errno = 0; @@ -290,7 +290,7 @@ struct CTABLE *nad_init(projCtx ctx, char *name) } } - fclose(fid); + pj_ctx_fclose(ctx, fid); return ct; } |