aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2012-07-24 16:36:30 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2012-07-24 16:36:30 +0000
commit70e4dad9f4106472f4507d665c8ea4bf2a9cdbd7 (patch)
tree92f2877b52fba8772622e2a92f17788cce3f729c /src
parentbc416d818180e58007a3360bcfcd57791f503976 (diff)
downloadPROJ-70e4dad9f4106472f4507d665c8ea4bf2a9cdbd7.tar.gz
PROJ-70e4dad9f4106472f4507d665c8ea4bf2a9cdbd7.zip
fixes for visual studio builds (#182)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2227 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
-rw-r--r--src/makefile.vc5
-rw-r--r--src/pj_gridcatalog.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/makefile.vc b/src/makefile.vc
index 58c348f6..5d69c19d 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -50,8 +50,9 @@ support = \
pj_qsfn.obj pj_strerrno.obj pj_tsfn.obj pj_units.obj \
pj_zpoly1.obj rtodms.obj vector1.obj pj_release.obj \
geocent.obj pj_transform.obj pj_datum_set.obj pj_datums.obj \
- pj_apply_gridshift.obj nad_cvt.obj nad_init.obj \
- nad_intr.obj pj_utils.obj pj_gridlist.obj pj_gridinfo.obj \
+ pj_apply_gridshift.obj pj_gc_reader.obj pj_gridcatalog.obj \
+ nad_cvt.obj nad_init.obj nad_intr.obj \
+ pj_utils.obj pj_gridlist.obj pj_gridinfo.obj \
proj_mdist.obj pj_mutex.obj pj_initcache.obj \
pj_ctx.obj pj_log.obj pj_apply_vgridshift.obj
diff --git a/src/pj_gridcatalog.c b/src/pj_gridcatalog.c
index c3873093..359e9fa0 100644
--- a/src/pj_gridcatalog.c
+++ b/src/pj_gridcatalog.c
@@ -121,6 +121,7 @@ int pj_gc_apply_gridshift( PJ *defn, int inverse,
LP input, output_after, output_before;
int itable;
double mix_ratio;
+ PJ_GRIDINFO *gi;
input.phi = y[io];
input.lam = x[io];
@@ -137,7 +138,7 @@ int pj_gc_apply_gridshift( PJ *defn, int inverse,
&(defn->last_after_region),
&(defn->last_after_date));
}
- PJ_GRIDINFO *gi = defn->last_after_grid;
+ gi = defn->last_after_grid;
assert( gi->child == NULL );
/* load the grid shift info if we don't have it. */