diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docs/source/apps/projinfo.rst | 2 | ||||
| -rw-r--r-- | docs/source/conf.py | 2 | ||||
| -rw-r--r-- | docs/source/operations/projections/healpix.rst | 2 | ||||
| -rw-r--r-- | src/iso19111/c_api.cpp | 12 | ||||
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 4 | ||||
| -rw-r--r-- | src/iso19111/crs.cpp | 8 | ||||
| -rw-r--r-- | src/proj.h | 4 | ||||
| -rw-r--r-- | src/proj_api.h | 2 | ||||
| -rw-r--r-- | src/release.cpp | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2761e542..a5715389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:") #PROJ version information ################################################################################ include(ProjVersion) -proj_version(MAJOR 7 MINOR 0 PATCH 0) +proj_version(MAJOR 6 MINOR 3 PATCH 0) set(PROJ_API_VERSION "17") set(PROJ_BUILD_VERSION "17.0.2") diff --git a/configure.ac b/configure.ac index e9274621..0ea8e04a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([PROJ], [7.0.0], +AC_INIT([PROJ], [6.3.0], [https://github.com/OSGeo/PROJ/issues], proj, [https://proj.org]) AC_CONFIG_MACRO_DIR([m4]) AC_LANG(C) diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index f6bf9ab0..6236056d 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -222,7 +222,7 @@ The following control parameters can appear in any order: .. option:: --3d - .. versionadded:: 7.0 + .. versionadded:: 6.3 "Promote" the CRS(s) to their 3D version. In the context of researching available coordinate transformations, explicitly specifying this option is diff --git a/docs/source/conf.py b/docs/source/conf.py index 914d8bba..b9e1fa8a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -68,7 +68,7 @@ copyright = u'1983-{0}'.format(now.year) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -version = '7.0.0' +version = '6.3.0' # use same |release| as |version| release = version diff --git a/docs/source/operations/projections/healpix.rst b/docs/source/operations/projections/healpix.rst index d28afa8d..cdefa522 100644 --- a/docs/source/operations/projections/healpix.rst +++ b/docs/source/operations/projections/healpix.rst @@ -53,7 +53,7 @@ Parameters .. option:: +rot_xy - .. versionadded:: 7.0.0 + .. versionadded:: 6.3.0 Rotation of the HEALPix map in degrees. A positive value results in a clockwise rotation around (x_0, y_0) in the cartesian / projected coordinate space. diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 18794f9d..edd4fbf3 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -1836,7 +1836,7 @@ PJ *proj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx, const PJ *crs, * @param grid_name Grid name (typically a .gtx file) * @return Object that must be unreferenced with proj_destroy(), or NULL * in case of error. - * @since 7.0 + * @since 6.3 */ PJ *proj_crs_create_bound_vertical_crs(PJ_CONTEXT *ctx, const PJ *vert_crs, const PJ *hub_geographic_3D_crs, @@ -3367,7 +3367,7 @@ PJ *proj_crs_alter_parameters_linear_unit(PJ_CONTEXT *ctx, const PJ *obj, * * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. - * @since 7.0 + * @since 6.3 */ PJ *proj_crs_promote_to_3D(PJ_CONTEXT *ctx, const char *crs_3D_name, const PJ *crs_2D) { @@ -3422,7 +3422,7 @@ PJ *proj_crs_promote_to_3D(PJ_CONTEXT *ctx, const char *crs_3D_name, * * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. - * @since 7.0 + * @since 6.3 */ PJ *proj_crs_create_projected_3D_crs_from_2D(PJ_CONTEXT *ctx, const char *crs_name, @@ -3509,7 +3509,7 @@ PJ *proj_crs_create_projected_3D_crs_from_2D(PJ_CONTEXT *ctx, * * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. - * @since 7.0 + * @since 6.3 */ PJ *proj_crs_demote_to_2D(PJ_CONTEXT *ctx, const char *crs_2D_name, const PJ *crs_3D) { @@ -4119,7 +4119,7 @@ PJ *proj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx, * * @return Object that must be unreferenced with * proj_destroy(), or NULL in case of error. - * @since 7.0 + * @since 6.3 */ PJ *proj_create_ellipsoidal_3D_cs(PJ_CONTEXT *ctx, @@ -6426,7 +6426,7 @@ PJ *proj_create_conversion_equal_earth(PJ_CONTEXT *ctx, double center_long, * linear_unit_conv_factor). * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor). * - * @since 7.0 + * @since 6.3 */ PJ *proj_create_conversion_vertical_perspective( PJ_CONTEXT *ctx, double topo_origin_lat, double topo_origin_long, diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index 12966bdd..556f18b6 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -4655,7 +4655,7 @@ ConversionNNPtr Conversion::createEqualEarth( * @param falseNorthing See \ref false_northing . (not in EPSG) * @return a new Conversion. * - * @since 7.0 + * @since 6.3 */ ConversionNNPtr Conversion::createVerticalPerspective( const util::PropertyMap &properties, const common::Angle &topoOriginLat, @@ -4716,7 +4716,7 @@ Conversion::createChangeVerticalUnit(const util::PropertyMap &properties, * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. * @return a new Conversion. - * @since 7.0 + * @since 6.3 */ ConversionNNPtr Conversion::createHeightDepthReversal(const util::PropertyMap &properties) { diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index eb15b0d8..a87ba82d 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -781,7 +781,7 @@ CRS::getNonDeprecated(const io::DatabaseContextNNPtr &dbContext) const { * 3D CRS. May be nullptr. * @return a new CRS promoted to 3D, or the current one if already 3D or not * applicable. - * @since 7.0 + * @since 6.3 */ CRSNNPtr CRS::promoteTo3D(const std::string &newName, const io::DatabaseContextPtr &dbContext) const { @@ -868,7 +868,7 @@ CRSNNPtr CRS::promoteTo3D(const std::string &newName, * 2D CRS. May be nullptr. * @return a new CRS demoted to 2D, or the current one if already 2D or not * applicable. - * @since 7.0 + * @since 6.3 */ CRSNNPtr CRS::demoteTo2D(const std::string &newName, const io::DatabaseContextPtr &dbContext) const { @@ -2192,7 +2192,7 @@ GeographicCRSNNPtr GeographicCRS::createEPSG_4807() { * 2D CRS. May be nullptr. * @return a new CRS demoted to 2D, or the current one if already 2D or not * applicable. - * @since 7.0 + * @since 6.3 */ GeographicCRSNNPtr GeographicCRS::demoteTo2D(const std::string &newName, @@ -3770,7 +3770,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { * 2D CRS. May be nullptr. * @return a new CRS demoted to 2D, or the current one if already 2D or not * applicable. - * @since 7.0 + * @since 6.3 */ ProjectedCRSNNPtr ProjectedCRS::demoteTo2D(const std::string &newName, @@ -152,8 +152,8 @@ extern "C" { #endif /* The version numbers should be updated with every release! **/ -#define PROJ_VERSION_MAJOR 7 -#define PROJ_VERSION_MINOR 0 +#define PROJ_VERSION_MAJOR 6 +#define PROJ_VERSION_MINOR 3 #define PROJ_VERSION_PATCH 0 extern char const PROJ_DLL pj_release[]; /* global release id string */ diff --git a/src/proj_api.h b/src/proj_api.h index 24046026..852cb14c 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -38,7 +38,7 @@ #endif #ifndef PJ_VERSION -#define PJ_VERSION 700 +#define PJ_VERSION 630 #endif #ifdef PROJ_RENAME_SYMBOLS diff --git a/src/release.cpp b/src/release.cpp index 648c5398..425bdb9a 100644 --- a/src/release.cpp +++ b/src/release.cpp @@ -11,7 +11,7 @@ char const pj_release[] = STR(PROJ_VERSION_MAJOR)"." STR(PROJ_VERSION_MINOR)"." STR(PROJ_VERSION_PATCH)", " - "March 1st, 2020"; + "January 1st, 2020"; const char *pj_get_release() { return pj_release; |