commit 60b34837cac60477ec0e6744c37a1f33035c4bb4
parent 5f4351a7758b4955c39b381c45aa749d76d57d57
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Fri, 13 Apr 2018 15:45:04 +0200
Minor changes, mostly spacing.
Diffstat:
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/senc2d_scene_analyze.c b/src/senc2d_scene_analyze.c
@@ -234,7 +234,8 @@ extract_connex_components
FOR_EACH(mm, 0, 2) {
const side_id_t side = SEGIDxSIDE_2_SEGSIDE(s_, mm);
const medium_id_t medium = seg_in->medium[mm];
- ASSERT(media_use[medium].first <= side && side <= media_use[medium].last);
+ ASSERT(media_use[medium].first <= side && side
+ <= media_use[medium].last);
}
}
} /* Implicit barrier here */
@@ -536,7 +537,7 @@ group_connex_components
(void)segsides;
ASSERT(desc && segsides && segments_comp && connex_components
- && next_enclosure_id && infinity_first_cc && res);
+ && s2d_view && next_enclosure_id && infinity_first_cc && res);
ASSERT(desc->enclosures_count == 1);
descriptors = darray_ptr_component_descriptor_data_get(connex_components);
@@ -679,7 +680,6 @@ group_connex_components
log_err(desc->scene->dev, "Media: %lu VS %lu\n",
(unsigned long)hit_seg_in->medium[hit_side],
(unsigned long)cc->medium);
-
*res = RES_BAD_ARG;
}
}
@@ -1009,9 +1009,9 @@ build_result
++enc->header.unique_segment_count;
FOR_EACH(i, 0, 2) {
- vrtx_id_t* id = htable_vrtx_id_find(&vtable, seg_in->vertice_id + i);
- if(id) {
- vertice_id[i] = *id; /* Known vertex */
+ vrtx_id_t* p_id = htable_vrtx_id_find(&vtable, seg_in->vertice_id + i);
+ if(p_id) {
+ vertice_id[i] = *p_id; /* Known vertex */
} else {
/* Create new association */
size_t tmp = htable_vrtx_id_size_get(&vtable);
@@ -1133,7 +1133,8 @@ senc2d_scene_analyze
}
if(res != RES_OK) goto error_;
- /* The first thread here allocates some data */
+ /* The first thread here allocates some data.
+ * Barrier needed at the end to ensure data created before any use. */
#pragma omp single
{
res_T tmp_res = RES_OK;
diff --git a/src/test_senc2d_descriptor.c b/src/test_senc2d_descriptor.c
@@ -71,42 +71,42 @@ main(int argc, char** argv)
CHK(count == 2);
CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 0, &count) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 10, &count) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 9, &count) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 10, &count) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 9, &count) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 10, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 10, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 9, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_count_by_medium(NULL, 9, NULL) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_count_by_medium(desc, 0, &count) == RES_OK);
CHK(count == 1);
CHK(senc2d_descriptor_get_enclosure(desc, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure(desc, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure(desc, 10, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure(desc, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure(desc, 9, NULL) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure(NULL, 0, &enc) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure(NULL, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure(NULL, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure(NULL, 10, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure(NULL, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure(NULL, 9, NULL) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure(desc, 0, &enc) == RES_OK);
CHK(senc2d_enclosure_ref_put(enc) == RES_OK);
CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 10, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 10, 0, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 10, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 10, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 10, 10, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 9, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 9, 0, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 9, 0, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 9, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 9, 9, NULL) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 0, &enc) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 10, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 10, 0, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 10, 0, NULL) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 10, 10, &enc) == RES_BAD_ARG);
- CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 10, 10, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 0, 9, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 9, 0, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 9, 0, NULL) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 9, 9, &enc) == RES_BAD_ARG);
+ CHK(senc2d_descriptor_get_enclosure_by_medium(NULL, 9, 9, NULL) == RES_BAD_ARG);
CHK(senc2d_descriptor_get_enclosure_by_medium(desc, 0, 0, &enc) == RES_OK);
CHK(senc2d_descriptor_get_global_vertices_count(NULL, &count) == RES_BAD_ARG);
