commit d965c68dd7e18ac525c12affeb247ef11c3d15f2
parent ec918ad1f19de3c3aa36a992e3f35e413e5a91f2
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 30 Oct 2020 13:18:29 +0100
Merge branch 'release_0.5.1'
Diffstat:
9 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
@@ -59,6 +59,13 @@ informations on CMake.
## Release notes
+### Version 0.5.1
+
+- Fix the `undefined strtok_r symbol` issue exhibited by some GCC versions that
+ leads to memory corruption and segmentation fault when parsing the ground
+ interfaces.
+- Fix typos in the man pages.
+
### Version 0.5
#### New feature
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -60,7 +60,7 @@ include_directories(
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 5)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(HTRDR_ARGS_DEFAULT_CAMERA_POS "0,0,0")
diff --git a/doc/htrdr.1.txt.in b/doc/htrdr.1.txt.in
@@ -57,12 +57,11 @@ that are subsequently recombined in order to obtain the final color for each
pixel, and finally the whole image of the scene as seen from the set
observation position. The two other ways consist in explicitly defining the
longwave or shortwave spectral range to handle and continuously sampling a
-wavelength in this range according to the Planck function for a reference
-temperature. Actually longwave and shortwave are keywords that mean that the
-source of radiation is whether external or internal to the medium,
-respectively. In shortwave, only the pixel radiance is evaluated and stored in
-the output image. In longwave this estimated radiance is then converted to its
-brightness temperature and both are saved in the image.
+wavelength in this range. Actually longwave and shortwave are keywords that
+mean that the source of radiation is whether external or internal to the
+medium, respectively. In shortwave, only the pixel radiance is evaluated and
+stored in the output image. In longwave this estimated radiance is then
+converted to its brightness temperature and both are saved in the image.
In *htrdr* the spatial unit 1.0 corresponds to one meter and the temperatures
are expressed in Kelvin. The estimated radiances are given in W/sr/m^2 excepted
@@ -199,11 +198,11 @@ OPTIONS
_wlen-max_ are equals the computation is monochromatic. *lw* means for
longwave but is here a code word that really means "computation of radiance
using the internal source of radiation": in other words, radiation is
- emitted by the medium and its boundaries. Because the application is for
- the terrestrial atmosphere, internal radiation is emitted in the thermal
- longwave part of the electromagnetic spectrum. Therefore the default value
- of the reference temperature used in the spectral sampling is fixed at 290
- K.
+ emitted by the medium and its boundaries (ground and space). Because the
+ application is for the terrestrial atmosphere, internal radiation is
+ emitted in the thermal longwave part of the electromagnetic spectrum.
+ Therefore the default value of the reference temperature used in the
+ spectral sampling is fixed at 290 K.
**sw**=*_wlen-min_*,*_wlen-max_*;;
perform the spectral sampling continuously in the [_wlen-min_, _wlen-max_]
@@ -285,7 +284,7 @@ nanometers with a reference temperature of 300 Kelvin:
-c clouds.htcp \
-C pos=0,0,400:tgt=0,1,0:up=0,0,1 \
-i def=800x600:spp=64 \
- -s lw=9200,1000:Tref=300
+ -s lw=9200,10000:Tref=300
-f -o output
Move the sun by setting its azimuthal and elevation angles to *120* and *40*
diff --git a/src/htrdr_ground.c b/src/htrdr_ground.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#define _POSIX_C_SOURCE 200112L /* strtok_r support */
+
#include "htrdr.h"
#include "htrdr_interface.h"
#include "htrdr_ground.h"
@@ -33,6 +35,8 @@
#include <star/s3d.h>
+#include <string.h> /* strtok_r */
+
/* Define the hash table that maps an Obj vertex id to its position into the
* vertex buffer */
#define HTABLE_NAME vertex
diff --git a/src/htrdr_ground.h b/src/htrdr_ground.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/htrdr_interface.c b/src/htrdr_interface.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/htrdr_interface.h b/src/htrdr_interface.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/htrdr_mtl.c b/src/htrdr_mtl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/htrdr_mtl.h b/src/htrdr_mtl.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
- * Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2019, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018, 2019 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
