commit 7353b1eef7c70bd5852065573b0f57880e1f2ce0
parent 42b970278150facec495a9ff1078f802983ddc9d
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 20 Jun 2024 10:43:20 +0200
Updated getters on Star-Enclosure scenes
These functions were incrementing the Star-Enclosure reference counter
before its return. This is both unnecessary and error-prone, since the
user can explicitly obtain the scene ownership if necessary, whereas he
may forget to release it if it has been silently incremented by the
function.
Diffstat:
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/sdis_scene.c b/src/sdis_scene.c
@@ -334,7 +334,6 @@ sdis_scene_get_senc2d_scene
{
if(!scn || !senc2d_scn) return RES_BAD_ARG;
if(!scn->senc2d_scn) return RES_BAD_ARG; /* Scene is 3D */
- SENC2D(scene_ref_get(scn->senc2d_scn));
*senc2d_scn = scn->senc2d_scn;
return RES_OK;
}
@@ -346,7 +345,6 @@ sdis_scene_get_senc3d_scene
{
if(!scn || !senc3d_scn) return RES_BAD_ARG;
if(!scn->senc3d_scn) return RES_BAD_ARG; /* Scene is 2D */
- SENC3D(scene_ref_get(scn->senc3d_scn));
*senc3d_scn = scn->senc3d_scn;
return RES_OK;
}
diff --git a/src/test_sdis_scene.c b/src/test_sdis_scene.c
@@ -266,9 +266,7 @@ test_scene_3d
BA(sdis_scene_get_senc3d_scene(scn, NULL));
BA(sdis_scene_get_senc3d_scene(NULL, &scn3d));
OK(sdis_scene_get_senc3d_scene(scn, &scn3d));
- OK(senc3d_scene_ref_put(scn3d));
- /* No 2D available */
- BA(sdis_scene_get_senc2d_scene(scn, &scn2d));
+ BA(sdis_scene_get_senc2d_scene(scn, &scn2d)); /* No 2D available */
BA(sdis_scene_get_radiative_env(NULL, &radenv));
BA(sdis_scene_get_radiative_env(scn, NULL));
@@ -502,9 +500,7 @@ test_scene_2d
BA(sdis_scene_get_senc2d_scene(scn, NULL));
BA(sdis_scene_get_senc2d_scene(NULL, &scn2d));
OK(sdis_scene_get_senc2d_scene(scn, &scn2d));
- OK(senc2d_scene_ref_put(scn2d));
- /* No 3D available */
- BA(sdis_scene_get_senc3d_scene(scn, &scn3d));
+ BA(sdis_scene_get_senc3d_scene(scn, &scn3d)); /* No 3D available */
BA(sdis_scene_get_radiative_env(NULL, NULL));
BA(sdis_scene_get_radiative_env(scn, NULL));