aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jimenez Shaw <j1@jimenezshaw.com>2021-04-20 20:41:28 +0200
committerJavier Jimenez Shaw <j1@jimenezshaw.com>2021-04-20 20:41:28 +0200
commit11b422cbc7c58072f920a29535e172f9eabe0e8b (patch)
tree1d228c795e814f21cc54e16de41cd66d727d0c28
parent8d0c7cef4b5e9687382519400380847587edc6cb (diff)
downloadPROJ-11b422cbc7c58072f920a29535e172f9eabe0e8b.tar.gz
PROJ-11b422cbc7c58072f920a29535e172f9eabe0e8b.zip
run reformat_cpp.sh to fix some leftovers
-rw-r--r--src/iso19111/c_api.cpp11
-rw-r--r--src/iso19111/factory.cpp3
-rw-r--r--test/unit/gie_self_tests.cpp6
-rw-r--r--test/unit/test_c_api.cpp6
4 files changed, 12 insertions, 14 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index cb44151a..ce7f2ae2 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -2676,8 +2676,9 @@ PROJ_STRING_LIST proj_get_codes_from_database(PJ_CONTEXT *ctx,
/** \brief Enumerate celestial bodies from the database.
*
- * The returned object is an array of PROJ_CELESTIAL_BODY_INFO* pointers, whose last
- * entry is NULL. This array should be freed with proj_celestial_body_list_destroy()
+ * The returned object is an array of PROJ_CELESTIAL_BODY_INFO* pointers, whose
+ * last entry is NULL. This array should be freed with
+ * proj_celestial_body_list_destroy()
*
* @param ctx PROJ context, or NULL for default context
* @param auth_name Authority name, used to restrict the search.
@@ -2688,9 +2689,8 @@ PROJ_STRING_LIST proj_get_codes_from_database(PJ_CONTEXT *ctx,
* proj_celestial_body_list_destroy(), or NULL in case of error.
* @since 8.1
*/
-PROJ_CELESTIAL_BODY_INFO **proj_get_celestial_body_list_from_database(PJ_CONTEXT *ctx,
- const char *auth_name,
- int *out_result_count) {
+PROJ_CELESTIAL_BODY_INFO **proj_get_celestial_body_list_from_database(
+ PJ_CONTEXT *ctx, const char *auth_name, int *out_result_count) {
SANITIZE_CTX(ctx);
PROJ_CELESTIAL_BODY_INFO **ret = nullptr;
int i = 0;
@@ -2741,7 +2741,6 @@ void proj_celestial_body_list_destroy(PROJ_CELESTIAL_BODY_INFO **list) {
}
}
-
// ---------------------------------------------------------------------------
/** Free a list of NULL terminated strings. */
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 8f2bd24a..5a81506b 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -7478,14 +7478,12 @@ AuthorityFactory::UnitInfo::UnitInfo()
deprecated{} {}
//! @endcond
-
// ---------------------------------------------------------------------------
//! @cond Doxygen_Suppress
AuthorityFactory::CelestialBodyInfo::CelestialBodyInfo() : authName{}, name{} {}
//! @endcond
-
// ---------------------------------------------------------------------------
/** \brief Return the list of units.
@@ -7564,7 +7562,6 @@ AuthorityFactory::getCelestialBodyList() const {
return res;
}
-
// ---------------------------------------------------------------------------
/** \brief Gets the official name from a possibly alias name.
diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp
index 59b78497..c7c1ddf5 100644
--- a/test/unit/gie_self_tests.cpp
+++ b/test/unit/gie_self_tests.cpp
@@ -809,14 +809,14 @@ TEST(gie, proj_create_crs_to_crs_with_area_large) {
// Test bugfix for https://github.com/OSGeo/gdal/issues/3695
auto area = proj_area_create();
proj_area_set_bbox(area, -14.1324, 49.5614, 3.76488, 62.1463);
- auto P = proj_create_crs_to_crs(PJ_DEFAULT_CTX, "EPSG:4277", "EPSG:4326",
- area);
+ auto P =
+ proj_create_crs_to_crs(PJ_DEFAULT_CTX, "EPSG:4277", "EPSG:4326", area);
proj_area_destroy(area);
ASSERT_TRUE(P != nullptr);
PJ_COORD c;
c.xyzt.x = 50; // Lat in deg
- c.xyzt.y = -2; // Long in deg
+ c.xyzt.y = -2; // Long in deg
c.xyzt.z = 0;
c.xyzt.t = HUGE_VAL;
c = proj_trans(P, PJ_FWD, c);
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
index 964d25d9..fa69c9aa 100644
--- a/test/unit/test_c_api.cpp
+++ b/test/unit/test_c_api.cpp
@@ -3903,7 +3903,8 @@ TEST_F(CApi, proj_get_celestial_body_list_from_database) {
{ proj_celestial_body_list_destroy(nullptr); }
{
- auto list = proj_get_celestial_body_list_from_database(nullptr, nullptr, 0);
+ auto list =
+ proj_get_celestial_body_list_from_database(nullptr, nullptr, 0);
ASSERT_NE(list, nullptr);
ASSERT_NE(list[0], nullptr);
ASSERT_NE(list[0]->auth_name, nullptr);
@@ -3912,7 +3913,8 @@ TEST_F(CApi, proj_get_celestial_body_list_from_database) {
}
{
int result_count = 0;
- auto list = proj_get_celestial_body_list_from_database(nullptr, "ESRI", &result_count);
+ auto list = proj_get_celestial_body_list_from_database(nullptr, "ESRI",
+ &result_count);
ASSERT_NE(list, nullptr);
EXPECT_GT(result_count, 1);
EXPECT_EQ(list[result_count], nullptr);