Small change to resolve conflict in baseline.c with PR 710

* also documentation change in boxGetSideLocations()
DanBloomberg · Aug 26, 2023 · 9b6edb2 · 9b6edb2
1 parent 776cd4e
commit 9b6edb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/baseline.c b/src/baseline.c
@@ -65,8 +65,8 @@ static const l_int32  ZeroThresholdRatio = 100;
 static const l_int32  DefaultSlices = 10;
 static const l_int32  DefaultSweepReduction = 2;
 static const l_int32  DefaultBsReduction = 1;
-static const l_float32  DefaultSweepRange = 5.;      /* degrees */
-static const l_float32  DefaultSweepDelta = 1.;      /* degrees */
+static const l_float32  DefaultSweepRange = 5.;     /* degrees */
+static const l_float32  DefaultSweepDelta = 1.;     /* degrees */
 static const l_float32  DefaultMinbsDelta = 0.01;   /* degrees */
 
     /* Overlap slice fraction added to top and bottom of each slice */

diff --git a/src/boxbasic.c b/src/boxbasic.c
@@ -346,7 +346,7 @@ boxSetGeometry(BOX     *box,
  * \brief   boxGetSideLocations()
  *
  * \param[in]    box
- * \param[out]   pl, pt, pr, pb     [optional] each can be null
+ * \param[out]   pl, pr, pt, pb     [optional] each can be null
  * \return  0 if OK, 1 on error
  *
  * <pre>