mrumtl

Describe materials that vary spectrally
git clone git://git.meso-star.fr/mrumtl.git
Log | Files | Refs | README | LICENSE

commit 647e3d3a30af2ca05d10138838aeaa9f6b26cc1e
parent 0d4d8db8bfc138a689575ba1fdc5a915664696b4
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  2 Mar 2020 15:11:16 +0100

Add and test the mrumtl_get_name function

Diffstat:
Msrc/mrumtl.c | 7+++++++
Msrc/mrumtl.h | 4++++
Msrc/test_mrumtl.c | 2++
3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/mrumtl.c b/src/mrumtl.c @@ -944,6 +944,13 @@ error: goto exit; } +const char* +mrumtl_get_name(const struct mrumtl* mrumtl) +{ + ASSERT(mrumtl && !str_is_empty(&mrumtl->name)); + return str_cget(&mrumtl->name); +} + res_T mrumtl_fetch_brdf (const struct mrumtl* mrumtl, diff --git a/src/mrumtl.h b/src/mrumtl.h @@ -81,6 +81,10 @@ mrumtl_load_stream FILE* stream, const char* stream_name); /* May be NULL */ +MRUMTL_API const char* +mrumtl_get_name + (const struct mrumtl* mrumtl); + MRUMTL_API res_T mrumtl_fetch_brdf (const struct mrumtl* mrumtl, diff --git a/src/test_mrumtl.c b/src/test_mrumtl.c @@ -64,6 +64,7 @@ main(int argc, char** argv) CHK(mrumtl_load(mrumtl, NULL) == RES_BAD_ARG); CHK(mrumtl_load(mrumtl, "undefined_file") == RES_IO_ERR); CHK(mrumtl_load(mrumtl, "my_mat.mrumtl") == RES_OK); + CHK(!strcmp(mrumtl_get_name(mrumtl), "my_mat.mrumtl")); CHK(mrumtl_ref_put(mrumtl) == RES_OK); rewind(fp); @@ -71,6 +72,7 @@ main(int argc, char** argv) CHK(mrumtl_load_stream(NULL, fp, NULL) == RES_BAD_ARG); CHK(mrumtl_load_stream(mrumtl, NULL, NULL) == RES_BAD_ARG); CHK(mrumtl_load_stream(mrumtl, fp, NULL) == RES_OK); + CHK(mrumtl_get_name(mrumtl) != NULL); CHK(mrumtl_ref_put(mrumtl) == RES_OK);