[Bf-blender-cvs] [b7150183e72] master: Cleanup: Silence some overflow warnings in transform code

Germano Cavalcante noreply at git.blender.org
Tue Jun 9 13:52:33 CEST 2020


Commit: b7150183e727f9df55ef49b770ad94674f82a438
Author: Germano Cavalcante
Date:   Tue Jun 9 08:51:51 2020 -0300
Branches: master
https://developer.blender.org/rBb7150183e727f9df55ef49b770ad94674f82a438

Cleanup: Silence some overflow warnings in transform code

===================================================================

M	source/blender/editors/transform/transform_convert.c
M	source/blender/editors/transform/transform_mode_edge_slide.c

===================================================================

diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index fba3370dcbc..d71843346f1 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -182,10 +182,10 @@ static void sort_trans_data_dist_container(const TransInfo *t, TransDataContaine
 
   if (i < tc->data_len) {
     if (t->flag & T_PROP_CONNECTED) {
-      qsort(start, tc->data_len - i, sizeof(TransData), trans_data_compare_dist);
+      qsort(start, (size_t)tc->data_len - i, sizeof(TransData), trans_data_compare_dist);
     }
     else {
-      qsort(start, tc->data_len - i, sizeof(TransData), trans_data_compare_rdist);
+      qsort(start, (size_t)tc->data_len - i, sizeof(TransData), trans_data_compare_rdist);
     }
   }
 }
@@ -204,8 +204,7 @@ static void sort_trans_data_selected_first_container(TransDataContainer *tc)
   TransData *sel, *unsel;
   TransData temp;
   unsel = tc->data;
-  sel = tc->data;
-  sel += tc->data_len - 1;
+  sel = &tc->data[tc->data_len - 1];
   while (sel > unsel) {
     while (unsel->flag & TD_SELECTED) {
       unsel++;
@@ -2479,9 +2478,9 @@ static int countAndCleanTransDataContainer(TransInfo *t)
 {
   BLI_assert(ELEM(t->data_len_all, 0, -1));
   t->data_len_all = 0;
-  uint data_container_len_orig = t->data_container_len;
+  int data_container_len_orig = t->data_container_len;
   for (TransDataContainer *th_end = t->data_container - 1,
-                          *tc = t->data_container + (t->data_container_len - 1);
+                          *tc = &t->data_container[t->data_container_len - 1];
        tc != th_end;
        tc--) {
     if (tc->data_len == 0) {
diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c
index 5613a782529..9f9e5742ffe 100644
--- a/source/blender/editors/transform/transform_mode_edge_slide.c
+++ b/source/blender/editors/transform/transform_mode_edge_slide.c
@@ -851,7 +851,7 @@ static bool createEdgeSlideVerts_double_side(TransInfo *t, TransDataContainer *t
 
   /* EDBM_flag_disable_all(em, BM_ELEM_SELECT); */
 
-  BLI_assert(STACK_SIZE(sv_array) == sv_tot);
+  BLI_assert(STACK_SIZE(sv_array) == (uint)sv_tot);
 
   sld->sv = sv_array;
   sld->totsv = sv_tot;



More information about the Bf-blender-cvs mailing list