From a492af45e3a0ebf09b15fb424b3462385dd8d3ba Mon Sep 17 00:00:00 2001
From: Barry Fowler <barfowl@gmail.com>
Date: Thu, 25 Aug 2022 17:47:12 -0700
Subject: [PATCH] Minor improvements to Far tutorials:     - addressed
 leaks-on-exit (#1226) and return value from main() for all     - fixed color
 indexing bug in tutorial_2_2 (#1241)     - suppressed a few compiler warnings

---
 tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp | 3 +++
 tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp | 3 +++
 tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp | 3 +++
 tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp | 5 ++++-
 tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp | 3 +++
 tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp | 5 ++++-
 tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp | 1 +
 tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp | 1 +
 tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp | 1 +
 tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp | 9 ++++++---
 tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp | 6 ++++--
 tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp | 3 ++-
 12 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp b/tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp
index 88c53b1b..f9539b7f 100644
--- a/tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp
+++ b/tutorials/far/tutorial_1_1/far_tutorial_1_1.cpp
@@ -182,6 +182,9 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp b/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp
index 8a5bd720..c85235bd 100644
--- a/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp
+++ b/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp
@@ -289,4 +289,7 @@ int main(int, char **) {
         }
         printf("\n");
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
diff --git a/tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp b/tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp
index d7ede0d4..f8687dbf 100644
--- a/tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp
+++ b/tutorials/far/tutorial_2_1/far_tutorial_2_1.cpp
@@ -207,6 +207,9 @@ int main(int, char **) {
         }
         printf(";\n");
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp b/tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp
index b787f21c..10edff3e 100644
--- a/tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp
+++ b/tutorials/far/tutorial_2_2/far_tutorial_2_2.cpp
@@ -333,7 +333,7 @@ int main(int, char **) {
         // Print colors
         int firstOfLastColors = refiner->GetNumFVarValuesTotal(channelColor) - ncolors;
 
-        for (int fvvert = 0; fvvert < nuvs; ++fvvert) {
+        for (int fvvert = 0; fvvert < ncolors; ++fvvert) {
             FVarVertexColor const & c = fvVertsColor[firstOfLastColors + fvvert];
             printf("c %f %f %f %f\n", c.r, c.g, c.b, c.a);
         }
@@ -355,5 +355,8 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp b/tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp
index 10c3f8c5..b4433b8a 100644
--- a/tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp
+++ b/tutorials/far/tutorial_2_3/far_tutorial_2_3.cpp
@@ -523,5 +523,8 @@ int main(int argc, char ** argv) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp b/tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp
index ba8826a7..fba7bae9 100644
--- a/tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp
+++ b/tutorials/far/tutorial_3_1/far_tutorial_3_1.cpp
@@ -269,7 +269,7 @@ bool
 TopologyRefinerFactory<Converter>::assignComponentTopology(
     TopologyRefiner & refiner, Converter const & conv) {
 
-    typedef Far::IndexArray      IndexArray;
+    using Far::IndexArray;
 
     { // Face relations:
         int nfaces = conv.GetNumFaces();
@@ -488,6 +488,9 @@ int main(int, char **) {
             printf("\n");
         }
     }
+
+    delete refiner;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp b/tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp
index baefb9e3..d6ca3ad8 100644
--- a/tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp
+++ b/tutorials/far/tutorial_4_1/far_tutorial_4_1.cpp
@@ -155,6 +155,7 @@ int main(int, char **) {
 
     delete refiner;
     delete stencilTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp b/tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp
index 2077c080..ab352788 100644
--- a/tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp
+++ b/tutorials/far/tutorial_4_2/far_tutorial_4_2.cpp
@@ -206,6 +206,7 @@ int main(int, char **) {
 
     delete vertexStencils;
     delete varyingStencils;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp b/tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp
index 0f15907f..dd3981f4 100644
--- a/tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp
+++ b/tutorials/far/tutorial_4_3/far_tutorial_4_3.cpp
@@ -209,6 +209,7 @@ int main(int, char **) {
 
     delete refiner;
     delete stencilTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp b/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp
index cadcdfef..5539af28 100644
--- a/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp
+++ b/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp
@@ -222,10 +222,10 @@ int main(int, char **) {
     Far::PtexIndices ptexIndices(*refiner);
 
     // Generate random samples on each ptex face
-    int nsamples = 200,
+    int nsamplesPerFace = 200,
         nfaces = ptexIndices.GetNumFaces();
 
-    std::vector<LimitFrame> samples(nsamples * nfaces);
+    std::vector<LimitFrame> samples(nsamplesPerFace * nfaces);
 
     srand( static_cast<int>(2147483647) );
 
@@ -233,7 +233,7 @@ int main(int, char **) {
 
     for (int face=0, count=0; face<nfaces; ++face) {
 
-        for (int sample=0; sample<nsamples; ++sample, ++count) {
+        for (int sample=0; sample<nsamplesPerFace; ++sample, ++count) {
 
             Real s = (Real)rand()/(Real)RAND_MAX,
                  t = (Real)rand()/(Real)RAND_MAX;
@@ -303,6 +303,9 @@ int main(int, char **) {
         printf("select deriv1Shape deriv2Shape;\n");
     }
 
+    delete refiner;
+    delete patchTable;
+    return EXIT_SUCCESS;
 }
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp b/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp
index 5a2bdc1f..7f31a723 100644
--- a/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp
+++ b/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp
@@ -172,7 +172,8 @@ namespace {
         for (int x = 0; x < multiplier; ++x) {
             for (int y = 0; y < multiplier; ++y) {
                 for (int z = 0; z < multiplier; ++z) {
-                    appendDefaultPrimitive(Pos(x * 2.0f, y * 2.0f, z * 2.0f),
+                    appendDefaultPrimitive(
+                        Pos((float)x * 2.0f, (float)y * 2.0f, (float)z * 2.0f),
                         vertsPerFace, faceVerts, positionsPerVert);
                 }
             }
@@ -284,7 +285,8 @@ namespace {
 
         int numVertices = refiner->GetNumVerticesTotal();
         posVector.resize(numVertices);
-        std::memcpy(&posVector[0], &shape->verts[0], numVertices * sizeof(Pos));
+        std::memcpy(&posVector[0].p[0], &shape->verts[0],
+                    numVertices * 3 * sizeof(float));
 
         delete shape;
         return refiner;
diff --git a/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp b/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp
index f2eb374a..27218aaa 100644
--- a/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp
+++ b/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp
@@ -228,7 +228,8 @@ namespace {
 
         int numVertices = refiner->GetNumVerticesTotal();
         posVector.resize(numVertices);
-        std::memcpy(&posVector[0], &shape->verts[0], numVertices * sizeof(Pos));
+        std::memcpy(&posVector[0].p[0], &shape->verts[0],
+                    numVertices * 3 * sizeof(float));
 
         delete shape;
         return refiner;