diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | libtool | 2 | ||||
| -rw-r--r-- | nad/Makefile.in | 2 | ||||
| -rw-r--r-- | nad/proj_outIGNF.dist | 24 | ||||
| -rw-r--r-- | src/Makefile.in | 11 | ||||
| -rw-r--r-- | src/pj_release.c | 2 |
6 files changed, 23 insertions, 20 deletions
@@ -1,5 +1,7 @@ 2012-03-06 Frank Warmerdam <warmerdam@pobox.com> + * Preparing 4.8.0 release candidate. + * nad/epsg: regenerate with +no_uoff for hotine oblique mercator (#104) * src/PJ_sconics.c: Fix missing P->sig term in pconic forward @@ -1,7 +1,7 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (proj) 4.7.0 +# Generated automatically by config.status (proj) 4.8.0 # Libtool was configured on host gdal65: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/nad/Makefile.in b/nad/Makefile.in index 7ce7b095..c00d8a93 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -207,7 +207,7 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \ proj_def.dat test27 test83 world epsg esri tv_out.dist \ testvarious testdatumfile testntv2 ntv2_out.dist \ esri.extra other.extra \ - IGNF testIGNF proj_outIGNF.dist \ + CH IGNF testIGNF proj_outIGNF.dist \ makefile.vc all: all-am diff --git a/nad/proj_outIGNF.dist b/nad/proj_outIGNF.dist index 8a8b1259..45112f60 100644 --- a/nad/proj_outIGNF.dist +++ b/nad/proj_outIGNF.dist @@ -1,14 +1,14 @@ +init=./IGNF:NTFG +to +init=./IGNF:RGF93G 3.300866856 43.4477976569 0.0000 3d18'0.915"E 43d26'52.077"N 0.000 +init=./IGNF:LAMBE +to +init=./IGNF:LAMB93 - 600000.0000 2600545.4523 0.0000 652760.737 7033791.244 0.000 + 600000.0000 2600545.4523 0.0000 652760.737 7033791.243 0.000 135638.3592 2418760.4094 0.0000 187194.062 6855928.882 0.000 998137.3947 2413822.2844 0.0000 1049052.258 6843776.562 0.000 - 600000.0000 2200000.0000 0.0000 649398.872 6633524.192 0.000 + 600000.0000 2200000.0000 0.0000 649398.872 6633524.191 0.000 311552.5340 1906457.4840 0.0000 358799.172 6342652.486 0.000 960488.4138 1910172.8812 0.0000 1007068.686 6340907.237 0.000 600000.0000 1699510.8340 0.0000 645204.279 6133556.746 0.000 -1203792.5981 626873.17210 0.0000 1238875.764 5057405.017 0.000 +1203792.5981 626873.17210 0.0000 1238875.764 5057405.016 0.000 +init=./IGNF:LAMBE +to +init=./IGNF:GEOPORTALFXX 600000.0000 2600545.4523 0.0000 179040.148 5610495.275 0.000 135638.3592 2418760.4094 0.0000 -303729.363 5410118.356 0.000 @@ -19,14 +19,14 @@ 600000.0000 1699510.8340 0.0000 179047.633 4708817.007 0.000 1203792.5981 626873.17210 0.0000 658287.395 3623739.237 0.000 +init=./IGNF:RGF93G +to +init=./IGNF:GEOPORTALFXX -2d20'11.4239243" 50d23'59.7718445" 0.0 179040.151 5610495.281 -0.000 --3d57'49.4051448" 48d35'59.7121716" 0.0 -303729.365 5410118.352 -0.000 -7d44'12.1439796" 48d35'59.7832558" 0.0 592842.794 5410120.550 -0.000 -2d20'11.4951975" 46d47'59.8029841" 0.0 179041.668 5209746.077 -0.000 --1d15'48.9240599" 44d05'59.8251878" 0.0 -96825.467 4909184.138 -0.000 -6d50'12.2276489" 44d06'00.0517019" 0.0 523880.022 4909191.143 -0.000 -2d20'11.7754730" 42d18'00.0824436" 0.0 179047.634 4708817.010 -0.000 -9d32'12.6680218" 41d24'00.3542556" 0.0 730783.054 4608637.873 -0.000 +2d20'11.4239243" 50d23'59.7718445" 0.0 179040.151 5610495.281 0.000 +-3d57'49.4051448" 48d35'59.7121716" 0.0 -303729.365 5410118.352 0.000 +7d44'12.1439796" 48d35'59.7832558" 0.0 592842.794 5410120.550 0.000 +2d20'11.4951975" 46d47'59.8029841" 0.0 179041.668 5209746.077 0.000 +-1d15'48.9240599" 44d05'59.8251878" 0.0 -96825.467 4909184.138 0.000 +6d50'12.2276489" 44d06'00.0517019" 0.0 523880.022 4909191.143 0.000 +2d20'11.7754730" 42d18'00.0824436" 0.0 179047.634 4708817.010 0.000 +9d32'12.6680218" 41d24'00.3542556" 0.0 730783.054 4608637.873 0.000 +init=./IGNF:RGF93G +to +init=./IGNF:MILLER 2d20'11.4239243" 50d23'59.7718445" 0.0 260098.730 6140682.441 0.000 -3d57'49.4051448" 48d35'59.7121716" 0.0 -441239.699 5880610.004 0.000 @@ -37,4 +37,4 @@ 2d20'11.7754730" 42d18'00.0824436" 0.0 260109.601 5009175.714 0.000 9d32'12.6680218" 41d24'00.3542556" 0.0 1061637.534 4889066.592 0.000 +init=./IGNF:RGR92 +to +init=./IGNF:REUN47 -3356123.5400 1303218.3090 5247430.6050 3353421.833 1304074.314 5248935.606 +3356123.5400 1303218.3090 5247430.6050 3353421.833 1304074.314 5248935.607 diff --git a/src/Makefile.in b/src/Makefile.in index 61ef536d..4d4b127c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -102,11 +102,11 @@ am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \ pj_open_lib.lo pj_param.lo pj_phi2.lo pj_pr_list.lo pj_qsfn.lo \ pj_strerrno.lo pj_tsfn.lo pj_units.lo pj_ctx.lo pj_log.lo \ pj_zpoly1.lo rtodms.lo vector1.lo pj_release.lo pj_gauss.lo \ - PJ_healpix.lo PJ_natearth.lo nad_cvt.lo nad_init.lo nad_intr.lo emess.lo \ - pj_apply_gridshift.lo pj_datums.lo pj_datum_set.lo \ - pj_transform.lo geocent.lo pj_utils.lo pj_gridinfo.lo \ - pj_gridlist.lo jniproj.lo pj_mutex.lo pj_initcache.lo \ - pj_apply_vgridshift.lo + PJ_healpix.lo PJ_natearth.lo nad_cvt.lo nad_init.lo \ + nad_intr.lo emess.lo pj_apply_gridshift.lo pj_datums.lo \ + pj_datum_set.lo pj_transform.lo geocent.lo pj_utils.lo \ + pj_gridinfo.lo pj_gridlist.lo jniproj.lo pj_mutex.lo \ + pj_initcache.lo pj_apply_vgridshift.lo libproj_la_OBJECTS = $(am_libproj_la_OBJECTS) libproj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -528,6 +528,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_mill.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_mod_ster.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_moll.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_natearth.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_nell.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_nell_h.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_nocol.Plo@am__quote@ diff --git a/src/pj_release.c b/src/pj_release.c index eecfd869..1b6e54aa 100644 --- a/src/pj_release.c +++ b/src/pj_release.c @@ -2,7 +2,7 @@ #include <projects.h> -char const pj_release[]="Rel. 4.8.0, 20 February 2012"; +char const pj_release[]="Rel. 4.8.0, 6 March 2012"; const char *pj_get_release() |