star-enclosures-2d

commit fb759bea1813c9787929f499943be4ca5504c9cf
parent 185b76b05ace10f04ee63d26318e1262fd2f04ad
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 10 Jul 2018 15:52:19 +0200

Fix for get_enclosure_[count_]by_medium

Diffstat:
M
src/senc2d_descriptor.c
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/senc2d_descriptor.c b/src/senc2d_descriptor.c
@@ -109,16 +109,16 @@ senc2d_descriptor_get_enclosure_count
 res_T
 senc2d_descriptor_get_enclosure_count_by_medium
   (const struct senc2d_descriptor* desc,
-   const unsigned med,
+   const unsigned imed,
    unsigned* count)
 {
   size_t tmp;
   const struct darray_uint* ids;
-  if(!desc || !count || med >= desc->scene->nmeds)
+  if(!desc || !count || imed >= desc->scene->nmeds)
     return RES_BAD_ARG;
   ASSERT(darray_ids_array_size_get(&desc->ids_array_by_medium)
     == desc->scene->nmeds);
-  ids = darray_ids_array_cdata_get(&desc->ids_array_by_medium);
+  ids = darray_ids_array_cdata_get(&desc->ids_array_by_medium) + imed;
   tmp = darray_uint_size_get(ids);
   ASSERT(tmp < UINT_MAX); /* API type */
   *count = (unsigned)tmp;
@@ -144,14 +144,14 @@ senc2d_descriptor_get_enclosure
 res_T
 senc2d_descriptor_get_enclosure_by_medium
   (struct senc2d_descriptor* desc,
-   const unsigned med,
+   const unsigned imed,
    const unsigned idx,
    struct senc2d_enclosure** out_enc)
 {
   const struct darray_uint* ids;
   unsigned index;
-  if(!desc || med >= desc->scene->nmeds || !out_enc) return RES_BAD_ARG;
-  ids = darray_ids_array_cdata_get(&desc->ids_array_by_medium);
+  if(!desc || imed >= desc->scene->nmeds || !out_enc) return RES_BAD_ARG;
+  ids = darray_ids_array_cdata_get(&desc->ids_array_by_medium) + imed;
   if(idx >= darray_ids_array_size_get(&desc->ids_array_by_medium))
     return RES_BAD_ARG;
   index = darray_uint_cdata_get(ids)[idx];