[Bf-blender-cvs] [fcd61d2056f] master: Cleanup: Move uv_parametrizer.c to C++

[Chris Blackbourn]

Commit: fcd61d2056f8988ded3d0ee35696aad0b424edc8
Author: Chris Blackbourn
Date:   Sat Aug 6 13:53:46 2022 +1200
Branches: master
https://developer.blender.org/rBfcd61d2056f8988ded3d0ee35696aad0b424edc8

Cleanup: Move uv_parametrizer.c to C++

Differential Review: https://developer.blender.org/D15618

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

M	source/blender/geometry/CMakeLists.txt
R099	source/blender/geometry/intern/uv_parametrizer.c	source/blender/geometry/intern/uv_parametrizer.cc

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

diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index da83d9e8957..0f06890cbfa 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -27,7 +27,7 @@ set(SRC
   intern/reverse_uv_sampler.cc
   intern/set_curve_type.cc
   intern/subdivide_curves.cc
-  intern/uv_parametrizer.c
+  intern/uv_parametrizer.cc
 
   GEO_add_curves_on_mesh.hh
   GEO_fillet_curves.hh
diff --git a/source/blender/geometry/intern/uv_parametrizer.c b/source/blender/geometry/intern/uv_parametrizer.cc
similarity index 99%
rename from source/blender/geometry/intern/uv_parametrizer.c
rename to source/blender/geometry/intern/uv_parametrizer.cc
index fecbb0edc47..efda55e2669 100644
--- a/source/blender/geometry/intern/uv_parametrizer.c
+++ b/source/blender/geometry/intern/uv_parametrizer.cc
@@ -2287,7 +2287,7 @@ static void p_abf_setup_system(PAbfSystem *sys)
   sys->lambdaPlanar = (float *)MEM_callocN(sizeof(float) * sys->ninterior, "ABFlamdaplane");
   sys->lambdaLength = (float *)MEM_mallocN(sizeof(float) * sys->ninterior, "ABFlambdalen");
 
-  sys->J2dt = MEM_mallocN(sizeof(float) * sys->nangles * 3, "ABFj2dt");
+  sys->J2dt = static_cast<float(*)[3]>(MEM_mallocN(sizeof(float) * sys->nangles * 3, "ABFj2dt"));
   sys->bstar = (float *)MEM_mallocN(sizeof(float) * sys->nfaces, "ABFbstar");
   sys->dstar = (float *)MEM_mallocN(sizeof(float) * sys->nfaces, "ABFdstar");
 
@@ -3666,7 +3666,7 @@ static void p_chart_rotate_minimum_area(PChart *chart)
 
 static void p_chart_rotate_fit_aabb(PChart *chart)
 {
-  float(*points)[2] = MEM_mallocN(sizeof(*points) * chart->nverts, __func__);
+  float(*points)[2] = static_cast<float(*)[2]>(MEM_mallocN(sizeof(*points) * chart->nverts, __func__));
 
   p_chart_uv_to_array(chart, points);
 
@@ -3827,8 +3827,8 @@ static void p_add_ngon(ParamHandle *handle,
   MemArena *arena = handle->polyfill_arena;
   Heap *heap = handle->polyfill_heap;
   uint nfilltri = nverts - 2;
-  uint(*tris)[3] = BLI_memarena_alloc(arena, sizeof(*tris) * (size_t)nfilltri);
-  float(*projverts)[2] = BLI_memarena_alloc(arena, sizeof(*projverts) * (size_t)nverts);
+  uint(*tris)[3] = static_cast<uint(*)[3]>(BLI_memarena_alloc(arena, sizeof(*tris) * (size_t)nfilltri));
+  float(*projverts)[2] = static_cast<float(*)[2]>(BLI_memarena_alloc(arena, sizeof(*projverts) * (size_t)nverts));
 
   /* Calc normal, flipped: to get a positive 2d cross product. */
   float normal[3];