← Back to branch summary

~ubuntu-branches/ubuntu/wily/proj/wily

~ubuntu-branches/ubuntu/wily/proj/wily

« back to all changes in this revision

Viewing changes to src/PJ_ocea.c

Committer: Package Import Robot
Author(s): Francesco Paolo Lovergine, Jerome Villeneuve Larouche, Francesco Paolo Lovergine
Date: 2013-11-25 15:11:25 UTC
mfrom: (1.2.7)
Revision ID: package-import@ubuntu.com-20131125151125-mvcw144wvgep1hev

Tags: 4.8.0-1

[ Jerome Villeneuve Larouche ]
* New upstream release
* Modified libproj-dev.install to remove nad_list.h and projects.h
* Modified proj-bin.install to remove nad2nad
* Modified proj-bin.manpages to remove nad2nad man
* Added symbols for libproj0

[ Francesco Paolo Lovergine ]
* Properly merged with current git master and sid version 4.7.0-2.
* Removed proj transitional package and obsolete conflicts/replaces against
series 4.6 and older.

files added:
.pc

.pc/.quilt_patches

.pc/.quilt_series

.pc/.version

.pc/applied-patches

debian/libproj0.symbols

jniwrap/org/proj4/PJ.java

jniwrap/org/proj4/PJException.java

jniwrap/org/proj4/package-info.java

nad/CH

proj.pc.in

src/PJ_healpix.c

src/PJ_igh.c

src/PJ_isea.c

src/PJ_natearth.c

src/multistresstest.c

src/pj_apply_vgridshift.c

src/pj_ctx.c

src/pj_log.c

src/proj_etmerc.c

files removed:
man/man1/nad2nad.1

src/nad2nad.c

src/nad_list.h

files modified:
ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

configure

configure.in

debian/changelog

debian/control

debian/libproj-dev.install

debian/proj-bin.install

debian/proj-bin.manpages

debian/rules

jniwrap/Makefile.in

jniwrap/README

jniwrap/build.xml

jniwrap/doxygen.cfg

jniwrap/org/Makefile.in

jniwrap/org/proj4/LatLong.java

jniwrap/org/proj4/Makefile.am

jniwrap/org/proj4/Makefile.in

jniwrap/org/proj4/Others.java

jniwrap/org/proj4/Proj4.java

jniwrap/org/proj4/Proj4Factory.java

jniwrap/org/proj4/ProjectionData.java

jniwrap/org/proj4/Projections.java

ltmain.sh *

man/Makefile.in

man/man1/Makefile.am

man/man1/Makefile.in

man/man3/Makefile.in

nad/IGNF

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/esri.extra

nad/other.extra

nad/proj_outIGNF.dist

nad/td_out.dist

nad/test27

nad/test83

nad/testIGNF

nad/testdatumfile

nad/testntv2

nad/testvarious

nad/tv_out.dist

nmake.opt

src/Makefile.am

src/Makefile.in

src/PJ_aea.c

src/PJ_aeqd.c

src/PJ_airy.c

src/PJ_aitoff.c

src/PJ_bipc.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_eck4.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fouc_s.c

src/PJ_geos.c

src/PJ_gn_sinu.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_lagrng.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_merc.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nsper.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_putp2.c

src/PJ_putp4p.c

src/PJ_putp6.c

src/PJ_robin.c

src/PJ_rpoly.c

src/PJ_sconics.c

src/PJ_somerc.c

src/PJ_stere.c

src/PJ_sterea.c

src/PJ_sts.c

src/PJ_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.h

src/geod.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad_init.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_ell_set.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_initcache.c

src/pj_inv.c

src/pj_list.h

src/pj_malloc.c

src/pj_mlfn.c

src/pj_mutex.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_utils.c

src/proj.c

src/proj.def

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/vector1.c

Show diffs side-by-side

added added

removed removed

41

41

42

42

P->rok = P->a / P->k0;

43

43

P->rtk = P->a * P->k0;

44

if ( pj_param(P->params, "talpha").i) {

45

alpha = pj_param(P->params, "ralpha").f;

46

lonz = pj_param(P->params, "rlonc").f;

44

if ( pj_param(P->ctx, P->params, "talpha").i) {

45

alpha = pj_param(P->ctx, P->params, "ralpha").f;

46

lonz = pj_param(P->ctx, P->params, "rlonc").f;

47

47

P->singam = atan(-cos(alpha)/(-sin(phi_0) * sin(alpha))) + lonz;

48

48

P->sinphi = asin(cos(phi_0) * sin(alpha));

49

49

} else {

50

phi_1 = pj_param(P->params, "rlat_1").f;

51

phi_2 = pj_param(P->params, "rlat_2").f;

52

lam_1 = pj_param(P->params, "rlon_1").f;

53

lam_2 = pj_param(P->params, "rlon_2").f;

50

phi_1 = pj_param(P->ctx, P->params, "rlat_1").f;

51

phi_2 = pj_param(P->ctx, P->params, "rlat_2").f;

52

lam_1 = pj_param(P->ctx, P->params, "rlon_1").f;

53

lam_2 = pj_param(P->ctx, P->params, "rlon_2").f;

54

54

P->singam = atan2(cos(phi_1) * sin(phi_2) * cos(lam_1) -

55

55

sin(phi_1) * cos(phi_2) * cos(lam_2),

56

56

sin(phi_1) * cos(phi_2) * sin(lam_2) -

Older »