|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66807 - sandbox/geometry/boost/geometry/extensions/gis/projections/proj
From: barend.gehrels_at_[hidden]
Date: 2010-11-28 04:34:17
Author: barendgehrels
Date: 2010-11-28 04:34:14 EST (Sun, 28 Nov 2010)
New Revision: 66807
URL: http://svn.boost.org/trac/boost/changeset/66807
Log:
Removed two warnings
Text files modified:
sandbox/geometry/boost/geometry/extensions/gis/projections/proj/omerc.hpp | 24 ++++++++++++------------
sandbox/geometry/boost/geometry/extensions/gis/projections/proj/stere.hpp | 20 ++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/proj/omerc.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/proj/omerc.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/proj/omerc.hpp 2010-11-28 04:34:14 EST (Sun, 28 Nov 2010)
@@ -16,7 +16,7 @@
// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,11 +47,11 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace omerc{
+ namespace detail { namespace omerc{
static const double TOL = 1.e-7;
static const double EPS = 1.e-10;
- inline double TSFN0(double x)
+ inline double TSFN0(double x)
{return tan(.5 * (HALFPI - (x))); }
@@ -61,8 +61,8 @@
double v_pole_n, v_pole_s, u_0;
int no_rot;
};
-
-
+
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -82,7 +82,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double Q, S, T, U, V, temp, u, v;
-
+
if (fabs(fabs(lp_lat) - HALFPI) > EPS) {
Q = this->m_proj_parm.E / pow(pj_tsfn(lp_lat, sin(lp_lat), this->m_par.e), this->m_proj_parm.B);
temp = 1. / Q;
@@ -95,7 +95,7 @@
v = 0.5 * this->m_proj_parm.ArB * log((1. - U)/(1. + U));
temp = cos(this->m_proj_parm.B * lp_lon);
u = (fabs(temp) < TOL) ? this->m_proj_parm.AB * lp_lon :
- this->m_proj_parm.ArB * atan2((S * this->m_proj_parm.cosgam + V * this->m_proj_parm.singam) , temp);
+ this->m_proj_parm.ArB * atan2((S * this->m_proj_parm.cosgam + V * this->m_proj_parm.singam) , temp);
} else {
v = lp_lat > 0 ? this->m_proj_parm.v_pole_n : this->m_proj_parm.v_pole_s;
u = this->m_proj_parm.ArB * lp_lat;
@@ -113,7 +113,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double u, v, Qp, Sp, Tp, Vp, Up;
-
+
if (this->m_proj_parm.no_rot) {
v = xy_y;
u = xy_x;
@@ -147,9 +147,9 @@
gamma0, lamc, lam1, lam2, phi1, phi2, alpha_c;
int alp, gam, no_off = 0;
proj_parm.no_rot = pj_param(par.params, "tno_rot").i;
- if (alp = pj_param(par.params, "talpha").i)
+ if ((alp = pj_param(par.params, "talpha").i))
alpha_c = pj_param(par.params, "ralpha").f;
- if (gam = pj_param(par.params, "tgamma").i)
+ if ((gam = pj_param(par.params, "tgamma").i))
gamma = pj_param(par.params, "rgamma").f;
if (alp || gam) {
lamc = pj_param(par.params, "rlonc").f;
@@ -239,7 +239,7 @@
}
}} // namespace detail::omerc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Oblique Mercator projection
@@ -286,7 +286,7 @@
factory.add_to_factory("omerc", new omerc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/proj/stere.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/proj/stere.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/proj/stere.hpp 2010-11-28 04:34:14 EST (Sun, 28 Nov 2010)
@@ -16,7 +16,7 @@
// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace stere{
+ namespace detail { namespace stere{
static const double EPS10 = 1.e-10;
static const double TOL = 1.e-8;
static const int NITER = 8;
@@ -90,7 +90,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, sinlam, sinX=0.0, cosX=0.0, X, A, sinphi;
-
+
coslam = cos(lp_lon);
sinlam = sin(lp_lon);
sinphi = sin(lp_lat);
@@ -126,7 +126,7 @@
{
double cosphi, sinphi, tp=0.0, phi_l=0.0, rho, halfe=0.0, halfpi=0.0;
int i;
-
+
rho = boost::math::hypot(xy_x, xy_y);
switch (this->m_proj_parm.mode) {
case OBLIQ:
@@ -137,7 +137,7 @@
phi_l = asin(cosphi * this->m_proj_parm.sinX1);
else
phi_l = asin(cosphi * this->m_proj_parm.sinX1 + (xy_y * sinphi * this->m_proj_parm.cosX1 / rho));
-
+
tp = tan(.5 * (HALFPI + phi_l));
xy_x *= sinphi;
xy_y = rho * this->m_proj_parm.cosX1 * cosphi - xy_y * this->m_proj_parm.sinX1* sinphi;
@@ -185,7 +185,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double sinphi, cosphi, coslam, sinlam;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -216,7 +216,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c, rh, sinc, cosc;
-
+
sinc = sin(c = 2. * atan((rh = boost::math::hypot(xy_x, xy_y)) / this->m_proj_parm.akm1));
cosc = cos(c);
lp_lon = 0.;
@@ -316,7 +316,7 @@
void setup_stere(Parameters& par, par_stere& proj_parm)
{
proj_parm.phits = pj_param(par.params, "tlat_ts").i ?
- proj_parm.phits = pj_param(par.params, "rlat_ts").f : HALFPI;
+ pj_param(par.params, "rlat_ts").f : HALFPI;
setup(par, proj_parm);
}
@@ -336,7 +336,7 @@
}
}} // namespace detail::stere
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Stereographic projection
@@ -442,7 +442,7 @@
factory.add_to_factory("ups", new ups_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk